Mercurial > hg
diff mercurial/hg.py @ 3441:ef2e990f9047
imported patch foo
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 17 Oct 2006 22:34:43 -0500 |
parents | 145a8fde69e6 |
children | 6ca49c5fe268 |
line wrap: on
line diff
--- a/mercurial/hg.py Tue Oct 17 22:26:14 2006 -0500 +++ b/mercurial/hg.py Tue Oct 17 22:34:43 2006 -0500 @@ -221,8 +221,6 @@ """update the working directory to node, merging linear changes""" stats = _merge.update(repo, node, False, False, None, None) _showstats(repo, stats) - branch = repo.changectx(node).branch() - repo.opener("branch", "w").write(branch + "\n") if stats[3]: repo.ui.status(_("There are unresolved merges with" " locally modified files.\n")) @@ -231,8 +229,6 @@ def clean(repo, node, wlock=None, show_stats=True): """forcibly switch the working directory to node, clobbering changes""" stats = _merge.update(repo, node, False, True, None, wlock) - branch = repo.changectx(node).branch() - repo.opener("branch", "w").write(branch + "\n") if show_stats: _showstats(repo, stats) return stats[3]