facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-08 07:49:11 +03:00
Code Issues Projects Releases Wiki Activity

merge: minor nullid cleanup

Browse Source
This commit is contained in:
Matt Mackall 2006-09-29 17:50:59 -05:00
parent 7af52acdea
commit 450d02d6e1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mercurial/merge.py
View File

@ -380,7 +380,7 @@ def update(repo, node, branchmerge=False, force=False, partial=None,
p1, p2 = p2, repo.changectx(nullid)
xp1, xp2 = str(p1), str(p2)
if p2.node() == nullid: xp2 = ''
if not p2: xp2 = ''
repo.hook('preupdate', throw=True, parent1=xp1, parent2=xp2)