equal
deleted
inserted
replaced
38 |
38 |
39 Amending revision 1 in a way that causes conflicts |
39 Amending revision 1 in a way that causes conflicts |
40 |
40 |
41 $ echo apricot > a |
41 $ echo apricot > a |
42 $ hg amend -m 'apricot' |
42 $ hg amend -m 'apricot' |
43 2 new orphan changesets |
43 2 new unstable changesets |
44 |
44 |
45 $ hg glog --hidden |
45 $ hg glog --hidden |
46 @ 4: apricot |
46 @ 5: apricot |
47 | |
47 | |
48 | o 3: coconut |
48 | x 4: temporary amend commit for 7f59f18ca4a9 |
49 | | |
49 | | |
50 | o 2: banana |
50 | | o 3: coconut |
51 | | |
51 | | | |
|
52 | | o 2: banana |
|
53 | |/ |
52 | x 1: apple |
54 | x 1: apple |
53 |/ |
55 |/ |
54 o 0: empty |
56 o 0: empty |
55 |
57 |
56 |
58 |
57 $ hg evolve -t :fail |
59 $ hg evolve -t :fail |
58 move:[2] banana |
60 move:[2] banana |
59 atop:[4] apricot |
61 atop:[5] apricot |
60 fix conflicts and see `hg help evolve.interrupted` |
62 fix conflicts and see `hg help evolve.interrupted` |
61 [1] |
63 [1] |
62 $ hg evolve --list |
64 $ hg evolve --list |
63 34a690fcf6ab: banana |
65 34a690fcf6ab: banana |
64 orphan: 7f59f18ca4a9 (obsolete parent) |
66 unstable: 7f59f18ca4a9 (obsolete parent) |
65 |
67 |
66 feb8c0bffa1f: coconut |
68 feb8c0bffa1f: coconut |
67 orphan: 34a690fcf6ab (orphan parent) |
69 unstable: 34a690fcf6ab (unstable parent) |
68 |
70 |
69 Evolve should detect unresolved conflict. |
71 Evolve should detect unresolved conflict. |
70 |
72 |
71 $ hg resolve --list |
73 $ hg resolve --list |
72 U a |
74 U a |
96 |
98 |
97 evolve the rest of the stack |
99 evolve the rest of the stack |
98 |
100 |
99 $ hg evolve |
101 $ hg evolve |
100 move:[3] coconut |
102 move:[3] coconut |
101 atop:[5] banana |
103 atop:[6] banana |
102 merging a |
104 merging a |
103 working directory is now at d77b4639fe26 |
105 working directory is now at d77b4639fe26 |
104 |
106 |
105 All commit evolved |
107 All commit evolved |
106 |
108 |
107 $ hg glog |
109 $ hg glog |
108 @ 6: coconut |
110 @ 7: coconut |
109 | |
111 | |
110 o 5: banana |
112 o 6: banana |
111 | |
113 | |
112 o 4: apricot |
114 o 5: apricot |
113 | |
115 | |
114 o 0: empty |
116 o 0: empty |
115 |
117 |