Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/hg.py @ 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 c03f58e5fd2d
children 3db700146536
comparison
equal deleted inserted replaced
255:20a44c82795f 256:649ed23e4661
892 remove.append(f) 892 remove.append(f)
893 else: 893 else:
894 self.ui.debug("working dir created %s, keeping\n" % f) 894 self.ui.debug("working dir created %s, keeping\n" % f)
895 895
896 for f, n in m2.iteritems(): 896 for f, n in m2.iteritems():
897 if f[0] == "/": continue
897 if f in ma and n != ma[f]: 898 if f in ma and n != ma[f]:
898 r = self.ui.prompt( 899 r = self.ui.prompt(
899 ("remote changed %s which local deleted\n" % f) + 900 ("remote changed %s which local deleted\n" % f) +
900 "(k)eep or (d)elete?", "[kd]", "k") 901 "(k)eep or (d)elete?", "[kd]", "k")
901 if r == "d": remove.append(f) 902 if r == "d": remove.append(f)
933 934
934 # merge the tricky bits 935 # merge the tricky bits
935 files = merge.keys() 936 files = merge.keys()
936 files.sort() 937 files.sort()
937 for f in files: 938 for f in files:
938 self.status("mering %f\n" % f) 939 self.ui.status("merging %s\n" % f)
939 m, o = merge[f] 940 m, o = merge[f]
940 self.merge3(f, m, o) 941 self.merge3(f, m, o)
941 self.dirstate.update([f], 'm') 942 self.dirstate.update([f], 'm')
942 943
943 for f in remove: 944 for f in remove: