Mercurial > public > mercurial-scm > hg-stable
diff mercurial/commands.py @ 5080:73fdc8bd3ed8
Update on pull -u when heads were closed (fixes issue666).
Patch written by Benoit Boissinot.
This should probably be improved in the future to handle long-living
branches, as joining two "other" heads will switch to that new head.
But this is not a new problem, as adding to the "other" head would have
switched to that new head, too.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Mon, 06 Aug 2007 20:25:50 +0200 |
| parents | 3d35c8cb5eb4 |
| children | f94dbc6c7eaf 90be02035993 |
line wrap: on
line diff
--- a/mercurial/commands.py Thu Jul 05 19:47:04 2007 -0700 +++ b/mercurial/commands.py Mon Aug 06 20:25:50 2007 +0200 @@ -2024,7 +2024,7 @@ if modheads == 0: return if optupdate: - if modheads == 1: + if modheads <= 1: return hg.update(repo, None) else: ui.status(_("not updating, since new heads added\n"))