Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-copy.out @ 1700:e2f91e0acbb8
hgmerge: add cleanup functions
This patch adds functions cleanup, success and failure.
The last two of these should be used instead of exit.
Current code was changed to use them.
It also moves $HGTMP to the top of the file (it's used in the cleanup
function), changes the comment and removes now unneeded trap
in the diff+patch merge.
author | Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> |
---|---|
date | Mon, 06 Feb 2006 17:32:06 -0600 |
parents | 4bfa960f8d2a |
children | 7544700fd931 |
rev | line source |
---|---|
363 | 1 A b |
2 b | |
3 b: copy a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 | |
1043 | 4 we should see two history entries |
5 changeset: 1:3b5b84850bbed12e8ff8c1b87b32dc93c59ae6d8 | |
6 tag: tip | |
7 user: test | |
8 date: Thu Jan 1 00:00:00 1970 +0000 | |
9 files: b | |
10 description: | |
11 2 | |
12 | |
13 | |
14 changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e | |
15 user: test | |
16 date: Thu Jan 1 00:00:00 1970 +0000 | |
17 files: a | |
18 description: | |
19 1 | |
20 | |
21 | |
22 we should see one log entry for a | |
23 changeset: 0:c19d34741b0a | |
24 user: test | |
25 date: Thu Jan 1 00:00:00 1970 +0000 | |
26 summary: 1 | |
27 | |
28 this should show a revision linked to changeset 0 | |
29 rev offset length base linkrev nodeid p1 p2 | |
30 0 0 3 0 0 b789fdd96dc2 000000000000 000000000000 | |
31 we should see one log entry for b | |
784
853bfbf1a312
Fix tests for short changeset hashes and hidden manifest hashes
mpm@selenic.com
parents:
749
diff
changeset
|
32 changeset: 1:3b5b84850bbe |
388
398737777644
Fixed tests for displaying tags in hg history and hg parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
382
diff
changeset
|
33 tag: tip |
363 | 34 user: test |
967
1f3710636b45
[PATCH] Print timezone offset when outputting dates
Samuel Tardieu <sam@rfc1149.net>
parents:
925
diff
changeset
|
35 date: Thu Jan 1 00:00:00 1970 +0000 |
363 | 36 summary: 2 |
37 | |
1043 | 38 this should show a revision linked to changeset 1 |
39 rev offset length base linkrev nodeid p1 p2 | |
40 0 0 65 0 1 9a263dd772e0 000000000000 000000000000 | |
41 this should show the rename information in the metadata | |
42 copyrev: b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 | |
43 copy: a | |
801
1f9ec150a476
Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
793
diff
changeset
|
44 566e338d09a089ba737c21e0d3759980 .hg/data/b.d |
925 | 45 60b725f10c9c85c70d97880dfe8191b3 bsum |
46 60b725f10c9c85c70d97880dfe8191b3 asum | |
363 | 47 checking changesets |
48 checking manifests | |
49 crosschecking files in changesets and manifests | |
50 checking files | |
51 2 files, 2 changesets, 2 total revisions |