Mercurial > hg > gitweb

comparison tests/test-merge-revert.out @ 925:5a034646e472

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
924:ab681ea2857e 925:5a034646e472
1 + hg init 1 1:3aa14bbc23d9
2 + hg add file1 file2 2 0:8633637036c1
3 + hg commit -m added file1 and file2 -d 0 0 -u user
4 + hg commit -m changed file1 -d 0 0 -u user
5 + hg -q log
6 1:3aa14bbc23d90e3f8b5b639b4a43d76509bae76c
7 0:8633637036c18f021d771208e16ae3508ab81d28
8 + hg id
9 3aa14bbc23d9 tip 3 3aa14bbc23d9 tip
10 + hg update -C 0
11 + hg id
12 8633637036c1 4 8633637036c1
13 + hg id
14 8633637036c1+ 5 8633637036c1+
15 + hg revert
16 + hg diff
17 + hg status
18 + hg id
19 8633637036c1 6 8633637036c1
20 + hg update
21 + hg diff
22 + hg status
23 + hg id
24 3aa14bbc23d9 tip 7 3aa14bbc23d9 tip
25 + hg update -C 0
26 + hg update
27 merging file1 8 merging file1
28 + hg diff
29 + hg status
30 + hg id
31 3aa14bbc23d9 tip 9 3aa14bbc23d9 tip
32 + hg revert
33 + hg diff
34 + hg status
35 + hg id
36 3aa14bbc23d9 tip 10 3aa14bbc23d9 tip
37 + hg revert -r tip
38 + hg diff
39 + hg status
40 + hg id
41 3aa14bbc23d9 tip 11 3aa14bbc23d9 tip
42 + hg update -C
43 + hg diff
44 + hg status
45 + hg id
46 3aa14bbc23d9 tip 12 3aa14bbc23d9 tip