Mercurial > hg
diff tests/test-merge-revert.out @ 925:5a034646e472
run-tests: remove '+ hg' trick
This was causing me a fair amount of debugging confusion. Let's just
forget it entirely. Updated tests to match.
| author | mpm@selenic.com |
|---|---|
| date | Tue, 16 Aug 2005 19:03:01 -0800 |
| parents | 01215ad04283 |
| children | 7544700fd931 |
line wrap: on
line diff
--- a/tests/test-merge-revert.out Tue Aug 16 17:30:41 2005 -0800 +++ b/tests/test-merge-revert.out Tue Aug 16 19:03:01 2005 -0800 @@ -1,46 +1,12 @@ -+ hg init -+ hg add file1 file2 -+ 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 -+ hg id +1:3aa14bbc23d9 +0:8633637036c1 3aa14bbc23d9 tip -+ hg update -C 0 -+ hg id 8633637036c1 -+ hg id 8633637036c1+ -+ hg revert -+ hg diff -+ hg status -+ hg id 8633637036c1 -+ hg update -+ hg diff -+ hg status -+ hg id 3aa14bbc23d9 tip -+ hg update -C 0 -+ hg update merging file1 -+ hg diff -+ hg status -+ hg id 3aa14bbc23d9 tip -+ hg revert -+ hg diff -+ hg status -+ hg id +3aa14bbc23d9 tip 3aa14bbc23d9 tip -+ hg revert -r tip -+ hg diff -+ hg status -+ hg id 3aa14bbc23d9 tip -+ hg update -C -+ hg diff -+ hg status -+ hg id -3aa14bbc23d9 tip