Mercurial > hg-stable

changeset 256:649ed23e4661

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
minor fixes for update() -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 minor fixes for update() manifest hash: ee88b90b933d83d5a9e108ec5519da93629bf29b -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCom+pywK+sNU5EO8RAqOxAJ9Cbk8NTlFAmlF3phcmz9MlaVYRuwCdGDjC oMFBjhRhvif/nBJbHjqW2Qw= =RN0T -----END PGP SIGNATURE-----
author mpm@selenic.com
date Sat, 04 Jun 2005 19:21:13 -0800
parents 20a44c82795f
children 65dccc4555c2
files mercurial/hg.py
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/hg.py	Sat Jun 04 19:09:00 2005 -0800
+++ b/mercurial/hg.py	Sat Jun 04 19:21:13 2005 -0800
@@ -894,6 +894,7 @@
                     self.ui.debug("working dir created %s, keeping\n" % f)
 
         for f, n in m2.iteritems():
+            if f[0] == "/": continue
             if f in ma and n != ma[f]:
                     r = self.ui.prompt(
                         ("remote changed %s which local deleted\n" % f) +
@@ -935,7 +936,7 @@
         files = merge.keys()
         files.sort()
         for f in files:
-            self.status("mering %f\n" % f)
+            self.ui.status("merging %s\n" % f)
             m, o = merge[f]
             self.merge3(f, m, o)
             self.dirstate.update([f], 'm')