Show More
@@ -420,6 +420,11 b' class rebaseruntime(object):' | |||
|
420 | 420 | editor=editor, |
|
421 | 421 | keepbranches=self.keepbranchesf, |
|
422 | 422 | date=self.date) |
|
423 | if newnode is None: | |
|
424 | # If it ended up being a no-op commit, then the normal | |
|
425 | # merge state clean-up path doesn't happen, so do it | |
|
426 | # here. Fix issue5494 | |
|
427 | mergemod.mergestate.clean(repo) | |
|
423 | 428 | else: |
|
424 | 429 | # Skip commit if we are collapsing |
|
425 | 430 | repo.dirstate.beginparentchange() |
@@ -272,3 +272,34 b' Abort the rebasing:' | |||
|
272 | 272 | o 0:public 'A' |
|
273 | 273 | |
|
274 | 274 | $ cd .. |
|
275 | ||
|
276 | Make sure merge state is cleaned up after a no-op rebase merge (issue5494) | |
|
277 | $ hg init repo | |
|
278 | $ cd repo | |
|
279 | $ echo a > a | |
|
280 | $ hg commit -qAm base | |
|
281 | $ echo b >> a | |
|
282 | $ hg commit -qm b | |
|
283 | $ hg up '.^' | |
|
284 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
285 | $ echo c >> a | |
|
286 | $ hg commit -qm c | |
|
287 | $ hg rebase -s 1 -d 2 --noninteractive | |
|
288 | rebasing 1:fdaca8533b86 "b" | |
|
289 | merging a | |
|
290 | warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | |
|
291 | unresolved conflicts (see hg resolve, then hg rebase --continue) | |
|
292 | [1] | |
|
293 | $ echo a > a | |
|
294 | $ echo c >> a | |
|
295 | $ hg resolve --mark a | |
|
296 | (no more unresolved files) | |
|
297 | continue: hg rebase --continue | |
|
298 | $ hg rebase --continue | |
|
299 | rebasing 1:fdaca8533b86 "b" | |
|
300 | note: rebase of 1:fdaca8533b86 created no changes to commit | |
|
301 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fdaca8533b86-7fd70513-backup.hg (glob) | |
|
302 | $ hg resolve --list | |
|
303 | $ test -f .hg/merge | |
|
304 | [1] | |
|
305 |
General Comments 0
You need to be logged in to leave comments.
Login now