Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge6.out @ 668:d93f0b127b6a
Dont trap SIGHUP on the other OS
# HG changeset patch
# User Edouard Gomez <ed.gomez@free.fr>
# Node ID 34a547cb33fe515ef4cdc8ccd173546671253ae9
# Parent 8c89408a7154d2da94766e957a088407fd0fef93
Dont trap SIGHUP on the other OS
HG doesn't work anymore on the other OS since signals are trapped.
This is due to the fact that as explained in Python docs not all
signals are defined for all platforms, so python was complaning about
missing signal.SIGHUP.
author | Edouard Gomez <ed.gomez@free.fr> |
---|---|
date | Sun, 10 Jul 2005 16:02:39 -0800 |
parents | 5d6177b72fcc |
children | 32f7dc81c07e |
line wrap: on
line source
+ cat + chmod +x merge + export HGMERGE=./merge + HGMERGE=./merge + mkdir A1 + cd A1 + hg init + echo This is file foo1 + echo This is file bar1 + hg add foo bar + hg commit -t 'commit text' -d '0 0' -u user + cd .. + hg clone A1 B1 cloning by hardlink + cd A1 + rm bar + hg remove bar + hg commit -t 'commit test' -d '0 0' -u user + cd ../B1 + echo This is file foo22 + hg commit -t 'commit test' -d '0 0' -u user + cd .. + hg clone A1 A2 cloning by hardlink + hg clone B1 B2 cloning by hardlink + cd A1 + hg pull ../B1 pulling from ../B1 searching for changes adding changesets adding manifests adding file revisions modified 1 files, added 1 changesets and 1 new revisions (run 'hg update' to get a working copy) + hg update -m + hg commit -t 'commit test' -d '0 0' -u user + echo bar should remain deleted. bar should remain deleted. + hg manifest 6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo + cd ../B2 + hg pull ../A2 pulling from ../A2 searching for changes adding changesets adding manifests adding file revisions modified 0 files, added 1 changesets and 0 new revisions (run 'hg update' to get a working copy) + hg update -m + hg commit -t 'commit test' -d '0 0' -u user + echo bar should remain deleted. bar should remain deleted. + hg manifest 6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo