Mercurial > public > mercurial-scm > hg
diff hgext/fetch.py @ 2849:3b21013e7680
fetch: fix test fail
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Thu, 10 Aug 2006 17:02:11 -0700 |
parents | 49988d9f0758 |
children | 53e843840349 |
line wrap: on
line diff
--- a/hgext/fetch.py Thu Aug 10 16:10:59 2006 -0700 +++ b/hgext/fetch.py Thu Aug 10 17:02:11 2006 -0700 @@ -24,13 +24,13 @@ 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: