equal
deleted
inserted
replaced
286 rebase aborted |
286 rebase aborted |
287 $ cat a |
287 $ cat a |
288 new |
288 new |
289 |
289 |
290 $ cd .. |
290 $ cd .. |
|
291 |
|
292 On the other hand, make sure we *do* clobber changes whenever we |
|
293 haven't somehow managed to update the repo to a different revision |
|
294 during a rebase (issue4661) |
|
295 |
|
296 $ hg ini yesupdate |
|
297 $ cd yesupdate |
|
298 $ echo "initial data" > foo.txt |
|
299 $ hg add |
|
300 adding foo.txt |
|
301 $ hg ci -m "initial checkin" |
|
302 $ echo "change 1" > foo.txt |
|
303 $ hg ci -m "change 1" |
|
304 $ hg up 0 |
|
305 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
306 $ echo "conflicting change 1" > foo.txt |
|
307 $ hg ci -m "conflicting 1" |
|
308 created new head |
|
309 $ echo "conflicting change 2" > foo.txt |
|
310 $ hg ci -m "conflicting 2" |
|
311 |
|
312 $ hg rebase -d 1 --tool 'internal:fail' |
|
313 rebasing 2:e4ea5cdc9789 "conflicting 1" |
|
314 unresolved conflicts (see hg resolve, then hg rebase --continue) |
|
315 [1] |
|
316 $ hg rebase --abort |
|
317 rebase aborted |
|
318 $ hg summary |
|
319 parent: 3:b16646383533 tip |
|
320 conflicting 2 |
|
321 branch: default |
|
322 commit: (clean) |
|
323 update: 1 new changesets, 2 branch heads (merge) |