equal
deleted
inserted
replaced
87 o 0:c471ef929e6a@default(draft) addroot |
87 o 0:c471ef929e6a@default(draft) addroot |
88 |
88 |
89 |
89 |
90 Test stabilizing a descendant predecessor's child |
90 Test stabilizing a descendant predecessor's child |
91 |
91 |
92 $ hg up 7 |
92 $ hg up -r 005fe5914f78 |
93 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
93 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
94 $ hg debugobsolete > successors.old |
94 $ hg debugobsolete > successors.old |
95 $ hg evolve -v |
95 $ hg evolve -v |
96 move:[3] addc |
96 move:[3] addc |
97 atop:[8] addb |
97 atop:[8] addb |
131 no troubled changesets |
131 no troubled changesets |
132 [1] |
132 [1] |
133 |
133 |
134 Test behavior with --any |
134 Test behavior with --any |
135 |
135 |
136 $ hg up 8 |
136 $ hg up 81b8bbcd5892 |
137 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
137 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
138 $ echo b >> b |
138 $ echo b >> b |
139 $ hg amend |
139 $ hg amend |
140 1 new unstable changesets |
140 1 new unstable changesets |
141 $ glog |
141 $ glog |
147 |/ |
147 |/ |
148 o 7:005fe5914f78@default(draft) adda |
148 o 7:005fe5914f78@default(draft) adda |
149 | |
149 | |
150 o 0:c471ef929e6a@default(draft) addroot |
150 o 0:c471ef929e6a@default(draft) addroot |
151 |
151 |
152 $ hg up 9 |
152 $ hg up 0f691739f917 |
153 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
153 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
154 $ hg evolve -v |
154 $ hg evolve -v |
155 nothing to evolve on current working copy parent |
155 nothing to evolve on current working copy parent |
156 (1 other unstable in the repository, do you want --any or --rev) |
156 (1 other orphan in the repository, do you want --any or --rev) |
157 [2] |
157 [2] |
158 $ hg evolve --any -v |
158 $ hg evolve --any -v |
159 move:[9] addc |
159 move:[9] addc |
160 atop:[11] addb |
160 atop:[11] addb |
161 hg rebase -r 0f691739f917 -d 7a68bc4596ea |
161 hg rebase -r 0f691739f917 -d 7a68bc4596ea |
177 o 7:005fe5914f78@default(draft) adda |
177 o 7:005fe5914f78@default(draft) adda |
178 | |
178 | |
179 o 0:c471ef929e6a@default(draft) addroot |
179 o 0:c471ef929e6a@default(draft) addroot |
180 |
180 |
181 $ hg evolve --any -v |
181 $ hg evolve --any -v |
182 no unstable changesets to evolve |
182 no orphan changesets to evolve |
183 [1] |
183 [1] |
184 |
184 |
185 Ambiguous evolution |
185 Ambiguous evolution |
186 $ echo a > k |
186 $ echo a > k |
187 $ hg add k |
187 $ hg add k |