equal
deleted
inserted
replaced
30 $ hg prev |
30 $ hg prev |
31 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
31 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
32 [1] b |
32 [1] b |
33 $ echo b2>b |
33 $ echo b2>b |
34 $ hg amend |
34 $ hg amend |
35 1 new orphan changesets |
35 1 new unstable changesets |
36 $ hg evolve |
36 $ hg evolve |
37 move:[2] c |
37 move:[2] c |
38 atop:[3] b |
38 atop:[4] b |
39 working directory is now at 813dde83a7f3 |
39 working directory is now at 813dde83a7f3 |
40 $ hg glog |
40 $ hg glog |
41 @ 4 - 813dde83a7f3 c (secret) |
41 @ 5 - 813dde83a7f3 c (secret) |
42 | |
42 | |
43 o 3 - fd89d0f19529 b (draft) |
43 o 4 - fd89d0f19529 b (draft) |
44 | |
44 | |
45 o 0 - cb9a9f314b8b a (draft) |
45 o 0 - cb9a9f314b8b a (draft) |
46 |
46 |
47 $ cd .. |
47 $ cd .. |
48 |
48 |
68 $ hg prev |
68 $ hg prev |
69 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
69 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
70 [1] b |
70 [1] b |
71 $ echo b2 > a |
71 $ echo b2 > a |
72 $ hg amend |
72 $ hg amend |
73 1 new orphan changesets |
73 1 new unstable changesets |
74 |
74 |
75 $ hg glog |
75 $ hg glog |
76 @ 3 - 87495ea7c9ec b (draft) |
76 @ 4 - 87495ea7c9ec b (draft) |
77 | |
77 | |
78 | o 2 - 13833940840c c (secret) |
78 | o 2 - 13833940840c c (secret) |
79 | | |
79 | | |
80 | x 1 - 1e6c11564562 b (draft) |
80 | x 1 - 1e6c11564562 b (draft) |
81 |/ |
81 |/ |
82 o 0 - cb9a9f314b8b a (draft) |
82 o 0 - cb9a9f314b8b a (draft) |
83 |
83 |
84 $ hg evolve |
84 $ hg evolve |
85 move:[2] c |
85 move:[2] c |
86 atop:[3] b |
86 atop:[4] b |
87 merging a |
87 merging a |
88 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
88 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
89 evolve failed! |
89 evolve failed! |
90 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort |
90 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort |
91 abort: unresolved merge conflicts (see hg help resolve) |
91 abort: unresolved merge conflicts (see hg help resolve) |
101 +======= |
101 +======= |
102 +c |
102 +c |
103 +>>>>>>> evolving: 13833940840c - test: c |
103 +>>>>>>> evolving: 13833940840c - test: c |
104 |
104 |
105 $ hg glog |
105 $ hg glog |
106 @ 3 - 87495ea7c9ec b (draft) |
106 @ 4 - 87495ea7c9ec b (draft) |
107 | |
107 | |
108 | o 2 - 13833940840c c (secret) |
108 | o 2 - 13833940840c c (secret) |
109 | | |
109 | | |
110 | x 1 - 1e6c11564562 b (draft) |
110 | x 1 - 1e6c11564562 b (draft) |
111 |/ |
111 |/ |
119 $ hg evolve -c |
119 $ hg evolve -c |
120 evolving 2:13833940840c "c" |
120 evolving 2:13833940840c "c" |
121 working directory is now at 3d2080c198e5 |
121 working directory is now at 3d2080c198e5 |
122 |
122 |
123 $ hg glog |
123 $ hg glog |
124 @ 4 - 3d2080c198e5 c (secret) |
124 @ 5 - 3d2080c198e5 c (secret) |
125 | |
125 | |
126 o 3 - 87495ea7c9ec b (draft) |
126 o 4 - 87495ea7c9ec b (draft) |
127 | |
127 | |
128 o 0 - cb9a9f314b8b a (draft) |
128 o 0 - cb9a9f314b8b a (draft) |
129 |
129 |