Mercurial > hg-stable
diff hgext/rebase.py @ 13878:a8d13ee0ce68
misc: replace .parents()[0] with p1()
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Mon, 04 Apr 2011 16:21:59 -0500 |
| parents | ff3c683eb8ff |
| children | 255009c77741 |
line wrap: on
line diff
--- a/hgext/rebase.py Mon Apr 04 16:21:57 2011 -0500 +++ b/hgext/rebase.py Mon Apr 04 16:21:59 2011 -0500 @@ -300,7 +300,7 @@ repo.ui.debug(" merge against %d:%s\n" % (repo[rev].rev(), repo[rev])) base = None if repo[rev].rev() != repo[min(state)].rev(): - base = repo[rev].parents()[0].node() + base = repo[rev].p1().node() return merge.update(repo, rev, True, True, False, base) def defineparents(repo, rev, target, state, targetancestors):