##// END OF EJS Templates
destutil: consistently retrieve 'p1' and 'branch'...
Pierre-Yves David -
r28104:96f8badd default
parent child Browse files
Show More
@@ -194,7 +194,7 b' def _destmergebranch(repo):'
194 """find merge destination based on branch heads"""
194 """find merge destination based on branch heads"""
195 node = None
195 node = None
196 parent = repo.dirstate.p1()
196 parent = repo.dirstate.p1()
197 branch = repo[None].branch()
197 branch = repo.dirstate.branch()
198 bheads = repo.branchheads(branch)
198 bheads = repo.branchheads(branch)
199 nbhs = [bh for bh in bheads if not repo[bh].bookmarks()]
199 nbhs = [bh for bh in bheads if not repo[bh].bookmarks()]
200
200
General Comments 0
You need to be logged in to leave comments. Login now