Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-up-local-change.out @ 668:d93f0b127b6a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
1 + mkdir r1
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
2 + cd r1
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
3 + hg init
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
4 + echo a
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
5 + hg addremove
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
6 + hg commit -t 1 -u test -d '0 0'
485
c5705ab9cebd [PATCH] add clone command
mpm@selenic.com
parents: 396
diff changeset
7 + hg clone . ../r2
642
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents: 619
diff changeset
8 cloning by hardlink
485
c5705ab9cebd [PATCH] add clone command
mpm@selenic.com
parents: 396
diff changeset
9 + cd ../r2
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
10 + hg up
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
11 + echo abc
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
12 + hg diff
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
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
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
15 --- a/a
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
16 +++ b/a
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
17 @@ -1,1 +1,1 @@
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
18 -a
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
19 +abc
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
20 + cd ../r1
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
21 + echo b
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
22 + echo a2
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
23 + hg addremove
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
24 + hg commit -t 2 -u test -d '0 0'
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
25 + cd ../r2
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
26 + hg -q pull ../r1
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
27 + hg status
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
28 C a
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
29 + hg --debug up
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
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
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
32 a versions differ, resolve
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
33 remote created b
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
34 getting b
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
35 merging a
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
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
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
38 + hg --debug up -m
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
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
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
41 + hg parents
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
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
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
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
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
46 summary: 2
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
47
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
48 + hg -v history
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
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
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
51 manifest: 1:1165e8bd193e17ad7d321d846fcf27ff3f412758
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
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
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
55 description:
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
56 2
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
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
d96c1153b25d update tests
Matt Mackall <mpm@selenic.com>
parents: 591
diff changeset
59
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
60 changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
61 manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
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
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
65 description:
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
66 1
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
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
d96c1153b25d update tests
Matt Mackall <mpm@selenic.com>
parents: 591
diff changeset
69
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
70 + hg diff
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
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
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
73 --- a/a
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
74 +++ b/a
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
75 @@ -1,1 +1,1 @@
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
76 -a2
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
77 +abc