Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-merge-revert2.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 3b1b44b917f4
comparison
equal deleted inserted replaced
924:ab681ea2857e 925:5a034646e472
1 + hg init 1 1:f4d7a8c73d23
2 + hg add file1 file2 2 0:232e179b3f29
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:f4d7a8c73d231bc078e2a5e791325e55e8a4c252
7 0:232e179b3f294d467cfa66e1439bc5b0d44e4a93
8 + hg id
9 f4d7a8c73d23 tip 3 f4d7a8c73d23 tip
10 + hg update -C 0
11 + hg id
12 232e179b3f29 4 232e179b3f29
13 + hg id
14 232e179b3f29+ 5 232e179b3f29+
15 + hg revert
16 + hg diff
17 + hg status
18 + hg id
19 232e179b3f29 6 232e179b3f29
20 + hg update
21 + hg diff
22 + hg status
23 + hg id
24 f4d7a8c73d23 tip 7 f4d7a8c73d23 tip
25 + hg update -C 0
26 + hg update
27 merge: warning: conflicts during merge 8 merge: warning: conflicts during merge
28 merging file1 9 merging file1
29 merging file1 failed! 10 merging file1 failed!
30 + hg diff
31 diff -r f4d7a8c73d23 file1 11 diff -r f4d7a8c73d23 file1
32 --- a/file1 12 --- a/file1
33 +++ b/file1 13 +++ b/file1
34 @@ -1,3 +1,7 @@ 14 @@ -1,3 +1,7 @@
35 added file1 15 added file1
37 +<<<<<<< 17 +<<<<<<<
38 +changed file1 different 18 +changed file1 different
39 +======= 19 +=======
40 changed file1 20 changed file1
41 +>>>>>>> 21 +>>>>>>>
42 + hg status
43 M file1 22 M file1
44 + hg id
45 f4d7a8c73d23+ tip 23 f4d7a8c73d23+ tip
46 + hg revert
47 + hg diff
48 + hg status
49 + hg id
50 f4d7a8c73d23 tip 24 f4d7a8c73d23 tip
51 + hg revert -r tip
52 + hg diff
53 + hg status
54 + hg id
55 f4d7a8c73d23 tip 25 f4d7a8c73d23 tip
56 + hg update -C
57 + hg diff
58 + hg status
59 + hg id
60 f4d7a8c73d23 tip 26 f4d7a8c73d23 tip