Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-merge-revert2.out @ 801:1f9ec150a476
Updated output of tests.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 29 Jul 2005 15:21:02 +0100 |
parents | 49ec802b4a16 |
children | 8f5637f0a0c0 |
line wrap: on
line diff
--- a/tests/test-merge-revert2.out +++ b/tests/test-merge-revert2.out @@ -1,12 +1,7 @@ -+ mkdir t -+ cd t + hg init -+ echo 'added file1' -+ echo 'added file2' + hg add file1 file2 -+ hg commit -m 'added file1 and file2' -d '0 0' -u user -+ echo 'changed file1' -+ hg commit -m 'changed file1' -d '0 0' -u user ++ hg commit -m added file1 and file2 -d 0 0 -u user ++ hg commit -m changed file1 -d 0 0 -u user + hg -q log 1:3aa14bbc23d90e3f8b5b639b4a43d76509bae76c 0:8633637036c18f021d771208e16ae3508ab81d28 @@ -15,7 +10,6 @@ 3aa14bbc23d9 tip + hg update -C 0 + hg id 8633637036c1 -+ echo 'changed file1' + hg id 8633637036c1+ + hg revert @@ -29,14 +23,11 @@ 8633637036c1 + hg id 3aa14bbc23d9 tip + hg update -C 0 -+ echo 'changed file1 different' -+ HGMERGE=merge + hg update merge: warning: conflicts during merge merging file1 merging file1 failed! + hg diff -+ sed -e 's/\(\(---\|+++\).*\)\t.*/\1/' -e 's/\(<<<<<<<\|>>>>>>>\) .*/\1/' diff -r 3aa14bbc23d9 file1 --- a/file1 +++ b/file1 @@ -66,5 +57,3 @@ 3aa14bbc23d9 tip + hg status + hg id 3aa14bbc23d9 tip -+ cd .. -+ /bin/rm -rf t