Mercurial > public > mercurial-scm > hg

comparison mercurial/hg.py @ 415:c2b9502a4e96

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted From: Michael A Fetterman <Michael.Fetterman@cl.cam.ac.uk> If an "hg update" is attempted across branches, it is aborted with an error message, basically saying that "update -m" is required. Don't prompt the user for "keep vs delete" kinds of questions before deciding to abort. manifest hash: 250d3a0e866af2feac9344d499b26c254c33abc4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuNeDywK+sNU5EO8RAu2BAJwNWXXN2L+4TnOUGaOe9iBj6CgOYgCfRKIE RF5czx2UQ2pSIP119xzq9mQ= =Akj6 -----END PGP SIGNATURE-----
author mpm@selenic.com
date Tue, 21 Jun 2005 19:14:11 -0800
parents a3b5347c22cd
children 5e9e8b8d2629
comparison
equal deleted inserted replaced
414:291a62848f54 415:c2b9502a4e96
1090 set_exec(self.wjoin(f), mode) 1090 set_exec(self.wjoin(f), mode)
1091 mark[f] = 1 1091 mark[f] = 1
1092 del m2[f] 1092 del m2[f]
1093 elif f in ma: 1093 elif f in ma:
1094 if not force and n != ma[f]: 1094 if not force and n != ma[f]:
1095 r = self.ui.prompt( 1095 r = ""
1096 (" local changed %s which remote deleted\n" % f) + 1096 if linear_path or allow:
1097 "(k)eep or (d)elete?", "[kd]", "k") 1097 r = self.ui.prompt(
1098 (" local changed %s which remote deleted\n" % f) +
1099 "(k)eep or (d)elete?", "[kd]", "k")
1098 if r == "d": 1100 if r == "d":
1099 remove.append(f) 1101 remove.append(f)
1100 else: 1102 else:
1101 self.ui.debug("other deleted %s\n" % f) 1103 self.ui.debug("other deleted %s\n" % f)
1102 remove.append(f) # other deleted it 1104 remove.append(f) # other deleted it
1111 self.ui.debug("working dir created %s, keeping\n" % f) 1113 self.ui.debug("working dir created %s, keeping\n" % f)
1112 1114
1113 for f, n in m2.iteritems(): 1115 for f, n in m2.iteritems():
1114 if f[0] == "/": continue 1116 if f[0] == "/": continue
1115 if not force and f in ma and n != ma[f]: 1117 if not force and f in ma and n != ma[f]:
1116 r = self.ui.prompt( 1118 r = ""
1117 ("remote changed %s which local deleted\n" % f) + 1119 if linear_path or allow:
1118 "(k)eep or (d)elete?", "[kd]", "k") 1120 r = self.ui.prompt(
1121 ("remote changed %s which local deleted\n" % f) +
1122 "(k)eep or (d)elete?", "[kd]", "k")
1119 if r == "d": remove.append(f) 1123 if r == "d": remove.append(f)
1120 else: 1124 else:
1121 self.ui.debug("remote created %s\n" % f) 1125 self.ui.debug("remote created %s\n" % f)
1122 get[f] = n 1126 get[f] = n
1123 1127