Mercurial > hg
comparison hgext/rebase.py @ 20545:5936058f6bad
rebase: fix 'rebase onto %d starting from %s' - show root instead of list repr
The debug statement is already in a 'for root in roots' so it was probably the
intention to show root instead of roots. Do that.
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Sat, 15 Feb 2014 01:23:12 +0100 |
| parents | f2a0a0e76b4c |
| children | bf1d91ab1efb |
comparison
equal
deleted
inserted
replaced
| 20544:8982a5397687 | 20545:5936058f6bad |
|---|---|
| 788 samebranch = root.branch() == dest.branch() | 788 samebranch = root.branch() == dest.branch() |
| 789 if not collapse and samebranch and root in dest.children(): | 789 if not collapse and samebranch and root in dest.children(): |
| 790 repo.ui.debug('source is a child of destination\n') | 790 repo.ui.debug('source is a child of destination\n') |
| 791 return None | 791 return None |
| 792 | 792 |
| 793 repo.ui.debug('rebase onto %d starting from %s\n' % (dest, roots)) | 793 repo.ui.debug('rebase onto %d starting from %s\n' % (dest, root)) |
| 794 state.update(dict.fromkeys(rebaseset, nullrev)) | 794 state.update(dict.fromkeys(rebaseset, nullrev)) |
| 795 # Rebase tries to turn <dest> into a parent of <root> while | 795 # Rebase tries to turn <dest> into a parent of <root> while |
| 796 # preserving the number of parents of rebased changesets: | 796 # preserving the number of parents of rebased changesets: |
| 797 # | 797 # |
| 798 # - A changeset with a single parent will always be rebased as a | 798 # - A changeset with a single parent will always be rebased as a |