equal
deleted
inserted
replaced
28 $ hg ci -Aqm "added a" |
28 $ hg ci -Aqm "added a" |
29 $ hg up .^ |
29 $ hg up .^ |
30 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
30 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
31 $ echo foo > b |
31 $ echo foo > b |
32 $ hg ci -Aqm "added b" |
32 $ hg ci -Aqm "added b" |
|
33 $ hg up c7586e2a9264 |
|
34 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
33 $ hg merge |
35 $ hg merge |
34 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
36 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
35 (branch merge, don't forget to commit) |
37 (branch merge, don't forget to commit) |
36 $ hg ci -m "merging a and b" |
38 $ hg ci -m "merging a and b" |
37 |
39 |
42 | | () draft |
44 | | () draft |
43 o | 1:c7586e2a9264 added a |
45 o | 1:c7586e2a9264 added a |
44 |/ () draft |
46 |/ () draft |
45 o 0:8fa14d15e168 added hgignore |
47 o 0:8fa14d15e168 added hgignore |
46 () draft |
48 () draft |
|
49 |
|
50 Checking issue6141 while at it: p1 is 1 and p2 is 2 |
|
51 |
|
52 $ hg parents |
|
53 changeset: 3:3b2b6f4652ee |
|
54 tag: tip |
|
55 parent: 1:c7586e2a9264 |
|
56 parent: 2:d76850646258 |
|
57 user: test |
|
58 date: Thu Jan 01 00:00:00 1970 +0000 |
|
59 summary: merging a and b |
|
60 |
47 |
61 |
48 Testing with obsoleting the second parent |
62 Testing with obsoleting the second parent |
49 |
63 |
50 $ hg up d76850646258 |
64 $ hg up d76850646258 |
51 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
65 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
77 | | () draft |
91 | | () draft |
78 o | 1:c7586e2a9264 added a |
92 o | 1:c7586e2a9264 added a |
79 |/ () draft |
93 |/ () draft |
80 o 0:8fa14d15e168 added hgignore |
94 o 0:8fa14d15e168 added hgignore |
81 () draft |
95 () draft |
|
96 |
|
97 Following issue6141: FIXME: p2 is now 1 |
82 |
98 |
83 $ hg parents |
99 $ hg parents |
84 changeset: 5:91fd62122a4b |
100 changeset: 5:91fd62122a4b |
85 tag: tip |
101 tag: tip |
86 parent: 4:64370c9805e7 |
102 parent: 4:64370c9805e7 |