Mercurial > hg
comparison hgext/rebase.py @ 23518:2fb0504b8175
rebase: show warning when rebase creates no changes to commit
Similar to graft:
note: rebase of 6:eea13746799a created no changes to commit
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Wed, 10 Dec 2014 06:20:35 +0100 |
parents | 4f18e80d9c30 |
children | 8872d1bf30da |
comparison
equal
deleted
inserted
replaced
23517:4f18e80d9c30 | 23518:2fb0504b8175 |
---|---|
410 newnode = None | 410 newnode = None |
411 # Update the state | 411 # Update the state |
412 if newnode is not None: | 412 if newnode is not None: |
413 state[rev] = repo[newnode].rev() | 413 state[rev] = repo[newnode].rev() |
414 else: | 414 else: |
415 ui.warn(_('note: rebase of %d:%s created no changes ' | |
416 'to commit\n') % (rev, ctx)) | |
415 if not collapsef: | 417 if not collapsef: |
416 ui.note(_('no changes, revision %d skipped\n') % rev) | |
417 ui.debug('next revision set to %s\n' % p1) | 418 ui.debug('next revision set to %s\n' % p1) |
418 skipped.add(rev) | 419 skipped.add(rev) |
419 state[rev] = p1 | 420 state[rev] = p1 |
420 elif state[rev] == nullmerge: | 421 elif state[rev] == nullmerge: |
421 pass | 422 pass |