equal
deleted
inserted
replaced
174 $ hg bookmarks |
174 $ hg bookmarks |
175 b1 1:a4183e9b3d31 |
175 b1 1:a4183e9b3d31 |
176 b2 2:c9b20c925790 |
176 b2 2:c9b20c925790 |
177 * ba 2:c9b20c925790 |
177 * ba 2:c9b20c925790 |
178 |
178 |
179 Non-mofified files are ignored: |
179 Non-modified files are ignored: |
180 |
180 |
181 $ touch b |
181 $ touch b |
182 $ hg commit -A b -m b |
182 $ hg commit -A b -m b |
183 $ touch c |
183 $ touch c |
184 $ hg add c |
184 $ hg add c |
223 1: Insert before 2b |
223 1: Insert before 2b |
224 1: 2b |
224 1: 2b |
225 2: 4d |
225 2: 4d |
226 2: insert aftert 4d |
226 2: insert aftert 4d |
227 |
227 |
|
228 $ hg co -qC 1 |
|
229 $ sedi 's/Insert/insert/' a |
|
230 $ hg absorb --apply-changes |
|
231 abort: no mutable changeset to change |
|
232 [255] |
|
233 |
228 Make working copy clean: |
234 Make working copy clean: |
229 |
235 |
230 $ hg revert -q -C a b |
236 $ hg co -qC ba |
231 $ hg forget c |
|
232 $ rm c |
237 $ rm c |
233 $ hg status |
238 $ hg status |
234 |
239 |
235 Merge commit will not be changed: |
240 Merge commit will not be changed: |
236 |
241 |
259 o 0 commit 1 public |
264 o 0 commit 1 public |
260 |
265 |
261 $ echo 2 >> m1 |
266 $ echo 2 >> m1 |
262 $ echo 2 >> m2 |
267 $ echo 2 >> m2 |
263 $ hg absorb --apply-changes |
268 $ hg absorb --apply-changes |
264 abort: no mutable changeset to change |
269 abort: cannot absorb into a merge |
265 [255] |
270 [255] |
266 $ hg revert -q -C m1 m2 |
271 $ hg revert -q -C m1 m2 |
267 |
272 |
268 Use a new repo: |
273 Use a new repo: |
269 |
274 |