Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/merge.py @ 2999:fa9c769fee8a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: minor simplification
author Matt Mackall <mpm@selenic.com>
date Tue, 22 Aug 2006 16:12:54 -0500
parents 833677bc9791
children 33dcf03ef45f
comparison
equal deleted inserted replaced
2998:833677bc9791 2999:fa9c769fee8a
179 util.set_exec(repo.wjoin(f), mode) 179 util.set_exec(repo.wjoin(f), mode)
180 del m2[f] 180 del m2[f]
181 elif f in ma: 181 elif f in ma:
182 if n != ma[f]: 182 if n != ma[f]:
183 r = _("d") 183 r = _("d")
184 if not overwrite and (linear_path or branchmerge): 184 if not overwrite:
185 r = repo.ui.prompt( 185 r = repo.ui.prompt(
186 (_(" local changed %s which remote deleted\n") % f) + 186 (_(" local changed %s which remote deleted\n") % f) +
187 _("(k)eep or (d)elete?"), _("[kd]"), _("k")) 187 _("(k)eep or (d)elete?"), _("[kd]"), _("k"))
188 if r == _("d"): 188 if r == _("d"):
189 remove.append(f) 189 remove.append(f)
209 continue 209 continue
210 if f[0] == "/": 210 if f[0] == "/":
211 continue 211 continue
212 if f in ma and n != ma[f]: 212 if f in ma and n != ma[f]:
213 r = _("k") 213 r = _("k")
214 if not overwrite and (linear_path or branchmerge): 214 if not overwrite:
215 r = repo.ui.prompt( 215 r = repo.ui.prompt(
216 (_("remote changed %s which local deleted\n") % f) + 216 (_("remote changed %s which local deleted\n") % f) +
217 _("(k)eep or (d)elete?"), _("[kd]"), _("k")) 217 _("(k)eep or (d)elete?"), _("[kd]"), _("k"))
218 if r == _("k"): 218 if r == _("k"):
219 get[f] = (m2.execf(f), n) 219 get[f] = (m2.execf(f), n)