Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-merge-revert2.out @ 808:8f5637f0a0c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with TAH
author mpm@selenic.com
date Sat, 30 Jul 2005 08:35:29 -0800
parents 1f9ec150a476
children ad8ff3534fde 1fe3b14c7044 9c918287d10b
comparison
equal deleted inserted replaced
788:64d2a558c943 808:8f5637f0a0c0
1 + hg init
2 + hg add file1 file2
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
10 + hg update -C 0
11 + hg id
12 8633637036c1
13 + hg id
14 8633637036c1+
15 + hg revert
16 + hg diff
17 + hg status
18 + hg id
19 8633637036c1
20 + hg update
21 + hg diff
22 + hg status
23 + hg id
24 3aa14bbc23d9 tip
25 + hg update -C 0
26 + hg update
27 merge: warning: conflicts during merge
28 merging file1
29 merging file1 failed!
30 + hg diff
31 diff -r 3aa14bbc23d9 file1
32 --- a/file1
33 +++ b/file1
34 @@ -1,2 +1,6 @@
35 added file1
36 +<<<<<<<
37 +changed file1 different
38 +=======
39 changed file1
40 +>>>>>>>
41 + hg status
42 M file1
43 + hg id
44 3aa14bbc23d9+ tip
45 + hg revert
46 + hg diff
47 + hg status
48 + hg id
49 3aa14bbc23d9 tip
50 + hg revert -r tip
51 + hg diff
52 + hg status
53 + hg id
54 3aa14bbc23d9 tip
55 + hg update -C
56 + hg diff
57 + hg status
58 + hg id
59 3aa14bbc23d9 tip