Mercurial > hg
diff mercurial/cmdutil.py @ 26938:080276d377d9
revert: allow configuring the .orig file location
author | Christian Delahousse <cdelahousse@fb.com> |
---|---|
date | Thu, 12 Nov 2015 17:00:08 -0600 |
parents | dda0aa3baedd |
children | 93bcc73df8d5 |
line wrap: on
line diff
--- a/mercurial/cmdutil.py Thu Nov 12 16:56:06 2015 -0600 +++ b/mercurial/cmdutil.py Thu Nov 12 17:00:08 2015 -0600 @@ -3082,7 +3082,7 @@ xlist.append(abs) if dobackup and (backup <= dobackup or wctx[abs].cmp(ctx[abs])): - bakname = "%s.orig" % rel + bakname = origpath(ui, repo, rel) ui.note(_('saving current version of %s as %s\n') % (rel, bakname)) if not opts.get('dry_run'):