Mercurial > hg > gitweb

comparison tests/test-merge-revert2.out @ 866:6d6095823b82

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with TAH
author mpm@selenic.com
date Fri, 12 Aug 2005 23:54:09 -0800
parents 9c918287d10b 6225bd773c51
children 62ec665759f2 01215ad04283
comparison
equal deleted inserted replaced
859:6390c377a9e6 866:6d6095823b82
1 + hg init 1 + hg init
2 + hg add file1 file2 2 + hg add file1 file2
3 + hg commit -m added file1 and file2 -d 0 0 -u user 3 + hg commit -m added file1 and file2 -d 0 0 -u user
4 + hg commit -m changed file1 -d 0 0 -u user 4 + hg commit -m changed file1 -d 0 0 -u user
5 + hg -q log 5 + hg -q log
6 1:3aa14bbc23d90e3f8b5b639b4a43d76509bae76c 6 1:f4d7a8c73d231bc078e2a5e791325e55e8a4c252
7 0:8633637036c18f021d771208e16ae3508ab81d28 7 0:232e179b3f294d467cfa66e1439bc5b0d44e4a93
8 + hg id 8 + hg id
9 3aa14bbc23d9 tip 9 f4d7a8c73d23 tip
10 + hg update -C 0 10 + hg update -C 0
11 + hg id 11 + hg id
12 8633637036c1 12 232e179b3f29
13 + hg id 13 + hg id
14 8633637036c1+ 14 232e179b3f29+
15 + hg revert 15 + hg revert
16 + hg diff 16 + hg diff
17 + hg status 17 + hg status
18 + hg id 18 + hg id
19 8633637036c1 19 232e179b3f29
20 + hg update 20 + hg update
21 + hg diff 21 + hg diff
22 + hg status 22 + hg status
23 + hg id 23 + hg id
24 3aa14bbc23d9 tip 24 f4d7a8c73d23 tip
25 + hg update -C 0 25 + hg update -C 0
26 + hg update 26 + hg update
27 merge: warning: conflicts during merge 27 merge: warning: conflicts during merge
28 merging file1 28 merging file1
29 merging file1 failed! 29 merging file1 failed!
30 + hg diff 30 + hg diff
31 diff -r 3aa14bbc23d9 file1 31 diff -r f4d7a8c73d23 file1
32 --- a/file1 32 --- a/file1
33 +++ b/file1 33 +++ b/file1
34 @@ -1,2 +1,6 @@ 34 @@ -1,3 +1,7 @@
35 added file1 35 added file1
36 another line of text
36 +<<<<<<< 37 +<<<<<<<
37 +changed file1 different 38 +changed file1 different
38 +======= 39 +=======
39 changed file1 40 changed file1
40 +>>>>>>> 41 +>>>>>>>
41 + hg status 42 + hg status
42 M file1 43 M file1
43 + hg id 44 + hg id
44 3aa14bbc23d9+ tip 45 f4d7a8c73d23+ tip
45 + hg revert 46 + hg revert
46 + hg diff 47 + hg diff
47 FIXME: This is a known bug:
48 + hg status 48 + hg status
49 + hg id 49 + hg id
50 3aa14bbc23d9 tip 50 f4d7a8c73d23 tip
51 + hg revert -r tip 51 + hg revert -r tip
52 + hg diff 52 + hg diff
53 + hg status 53 + hg status
54 + hg id 54 + hg id
55 3aa14bbc23d9 tip 55 f4d7a8c73d23 tip
56 + hg update -C 56 + hg update -C
57 + hg diff 57 + hg diff
58 + hg status 58 + hg status
59 + hg id 59 + hg id
60 3aa14bbc23d9 tip 60 f4d7a8c73d23 tip