Mercurial > hg > mercurial-crew-with-dirclash
annotate 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 |
rev | line source |
---|---|
331 | 1 + mkdir r1 |
2 + cd r1 | |
3 + hg init | |
4 + echo a | |
5 + hg addremove | |
6 + hg commit -t 1 -u test -d '0 0' | |
485 | 7 + hg clone . ../r2 |
642 | 8 cloning by hardlink |
485 | 9 + cd ../r2 |
331 | 10 + hg up |
11 + echo abc | |
12 + hg diff | |
13 + sed 's/\(\(---\|+++\).*\)\t.*/\1/' | |
396
8f8bb77d560e
Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
388
diff
changeset
|
14 diff -r c19d34741b0a a |
331 | 15 --- a/a |
16 +++ b/a | |
17 @@ -1,1 +1,1 @@ | |
18 -a | |
19 +abc | |
20 + cd ../r1 | |
21 + echo b | |
22 + echo a2 | |
23 + hg addremove | |
24 + hg commit -t 2 -u test -d '0 0' | |
25 + cd ../r2 | |
26 + hg -q pull ../r1 | |
27 + hg status | |
28 C a | |
591 | 29 + hg --debug up |
331 | 30 resolving manifests |
374
f07d00fcd281
update tests to reflect new short hash length
mpm@selenic.com
parents:
350
diff
changeset
|
31 ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e |
331 | 32 a versions differ, resolve |
33 remote created b | |
34 getting b | |
35 merging a | |
36 resolving a | |
374
f07d00fcd281
update tests to reflect new short hash length
mpm@selenic.com
parents:
350
diff
changeset
|
37 file a: other d730145abbf9 ancestor b789fdd96dc2 |
591 | 38 + hg --debug up -m |
331 | 39 resolving manifests |
374
f07d00fcd281
update tests to reflect new short hash length
mpm@selenic.com
parents:
350
diff
changeset
|
40 ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e |
331 | 41 + hg parents |
42 changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6 | |
388
398737777644
Fixed tests for displaying tags in hg history and hg parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
382
diff
changeset
|
43 tag: tip |
331 | 44 user: test |
382
37249c522770
test suite: fix timezone problems and port collision problem
mpm@selenic.com
parents:
377
diff
changeset
|
45 date: Thu Jan 1 00:00:00 1970 |
331 | 46 summary: 2 |
47 | |
48 + hg -v history | |
49 changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6 | |
388
398737777644
Fixed tests for displaying tags in hg history and hg parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
382
diff
changeset
|
50 tag: tip |
331 | 51 manifest: 1:1165e8bd193e17ad7d321d846fcf27ff3f412758 |
52 user: test | |
382
37249c522770
test suite: fix timezone problems and port collision problem
mpm@selenic.com
parents:
377
diff
changeset
|
53 date: Thu Jan 1 00:00:00 1970 |
494
6020bde714e4
Fixed test for previous change of 'hg -v history'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
490
diff
changeset
|
54 files: a b |
331 | 55 description: |
56 2 | |
57 | |
546
c8ae964109c1
Add an empty line after description in verbose mode of show_changeset.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
495
diff
changeset
|
58 |
619 | 59 |
331 | 60 changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e |
61 manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 | |
62 user: test | |
382
37249c522770
test suite: fix timezone problems and port collision problem
mpm@selenic.com
parents:
377
diff
changeset
|
63 date: Thu Jan 1 00:00:00 1970 |
494
6020bde714e4
Fixed test for previous change of 'hg -v history'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
490
diff
changeset
|
64 files: a |
331 | 65 description: |
66 1 | |
67 | |
546
c8ae964109c1
Add an empty line after description in verbose mode of show_changeset.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
495
diff
changeset
|
68 |
619 | 69 |
331 | 70 + hg diff |
71 + sed 's/\(\(---\|+++\).*\)\t.*/\1/' | |
396
8f8bb77d560e
Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
388
diff
changeset
|
72 diff -r 1e71731e6fbb a |
331 | 73 --- a/a |
74 +++ b/a | |
75 @@ -1,1 +1,1 @@ | |
76 -a2 | |
77 +abc |