Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-up-local-change.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
+ mkdir r1 + cd r1 + hg init + echo a + hg addremove + hg commit -t 1 -u test -d '0 0' + hg clone . ../r2 cloning by hardlink + cd ../r2 + hg up + echo abc + hg diff + sed 's/\(\(---\|+++\).*\)\t.*/\1/' diff -r c19d34741b0a a --- a/a +++ b/a @@ -1,1 +1,1 @@ -a +abc + cd ../r1 + echo b + echo a2 + hg addremove + hg commit -t 2 -u test -d '0 0' + cd ../r2 + hg -q pull ../r1 + hg status C a + hg --debug up resolving manifests ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e a versions differ, resolve remote created b getting b merging a resolving a file a: other d730145abbf9 ancestor b789fdd96dc2 + hg --debug up -m resolving manifests ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e + hg parents changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6 tag: tip user: test date: Thu Jan 1 00:00:00 1970 summary: 2 + hg -v history changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6 tag: tip manifest: 1:1165e8bd193e17ad7d321d846fcf27ff3f412758 user: test date: Thu Jan 1 00:00:00 1970 files: a b description: 2 changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 user: test date: Thu Jan 1 00:00:00 1970 files: a description: 1 + hg diff + sed 's/\(\(---\|+++\).*\)\t.*/\1/' diff -r 1e71731e6fbb a --- a/a +++ b/a @@ -1,1 +1,1 @@ -a2 +abc