annotate tests/test-merge6.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 |
9344f5dd4488 |
| children |
ced2d3620f95 |
| rev |
line source |
|
616
|
1 pulling from ../B1
|
|
|
2 searching for changes
|
|
|
3 adding changesets
|
|
|
4 adding manifests
|
|
775
|
5 adding file changes
|
|
1043
|
6 added 1 changesets with 1 changes to 1 files (+1 heads)
|
|
616
|
7 (run 'hg update' to get a working copy)
|
|
|
8 bar should remain deleted.
|
|
993
|
9 f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo
|
|
616
|
10 pulling from ../A2
|
|
|
11 searching for changes
|
|
|
12 adding changesets
|
|
|
13 adding manifests
|
|
775
|
14 adding file changes
|
|
1043
|
15 added 1 changesets with 0 changes to 0 files (+1 heads)
|
|
616
|
16 (run 'hg update' to get a working copy)
|
|
|
17 bar should remain deleted.
|
|
990
|
18 f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo
|
