mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 23:38:50 +03:00
fetch: fix test fail
This commit is contained in:
parent
375ed90afa
commit
bfa688e22b
@ -24,13 +24,13 @@ def fetch(ui, repo, source='default', **opts):
|
||||
if modheads == 0:
|
||||
return 0
|
||||
if modheads == 1:
|
||||
return hg.update(repo, repo.changelog.tip(), wlock=wlock)
|
||||
return hg.clean(repo, repo.changelog.tip(), wlock=wlock)
|
||||
newheads = repo.heads(parent)
|
||||
newchildren = [n for n in repo.heads(parent) if n != parent]
|
||||
newparent = parent
|
||||
if newchildren:
|
||||
newparent = newchildren[0]
|
||||
hg.update(repo, newparent, wlock=wlock)
|
||||
hg.clean(repo, newparent, wlock=wlock)
|
||||
newheads = [n for n in repo.heads() if n != newparent]
|
||||
err = False
|
||||
if newheads:
|
||||
|
Loading…
Reference in New Issue
Block a user