Mercurial > public > mercurial-scm > hg

diff mercurial/commands.py @ 28030:ca2a0a654f54

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: warn about other topological head in pull and unbundle Other commands have a '--update' triggering a bare update. We now issue the message introduced into the previous changeset for these too.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Wed, 03 Feb 2016 15:12:01 +0000
parents 72072cfc7e91
children 8157c6b82f40
line wrap: on
line diff
--- a/mercurial/commands.py	Tue Feb 02 14:49:02 2016 +0000
+++ b/mercurial/commands.py	Wed Feb 03 15:12:01 2016 +0000
@@ -5542,13 +5542,17 @@
     if modheads == 0:
         return
     if optupdate:
+        warndest = False
         try:
             brev = checkout
             movemarkfrom = None
             if not checkout:
+                warndest = True
                 updata = destutil.destupdate(repo)
                 checkout, movemarkfrom, brev = updata
             ret = hg.update(repo, checkout)
+            if warndest:
+                destutil.statusotherdests(ui, repo)
         except error.UpdateAbort as inst:
             msg = _("not updating: %s") % str(inst)
             hint = inst.hint