Show More
@@ -5678,7 +5678,7 b' def resolve(ui, repo, *pats, **opts):' | |||
|
5678 | 5678 | # for files in tocomplete, ms.resolve will not overwrite |
|
5679 | 5679 | # .orig -- only preresolve does |
|
5680 | 5680 | try: |
|
5681 |
util.rename(a + ".resolve", a |
|
|
5681 | util.rename(a + ".resolve", cmdutil.origpath(ui, repo, a)) | |
|
5682 | 5682 | except OSError as inst: |
|
5683 | 5683 | if inst.errno != errno.ENOENT: |
|
5684 | 5684 | raise |
@@ -197,6 +197,18 b' resolve --all should re-merge all unreso' | |||
|
197 | 197 | $ cat file2.orig |
|
198 | 198 | foo |
|
199 | 199 | baz |
|
200 | ||
|
201 | .orig files should exists where specified | |
|
202 | $ hg resolve --all --verbose --config 'ui.origbackuppath=.hg/origbackups' | |
|
203 | merging file1 | |
|
204 | creating directory: $TESTTMP/repo/.hg/origbackups | |
|
205 | merging file2 | |
|
206 | warning: conflicts while merging file1! (edit, then use 'hg resolve --mark') | |
|
207 | warning: conflicts while merging file2! (edit, then use 'hg resolve --mark') | |
|
208 | [1] | |
|
209 | $ ls .hg/origbackups | |
|
210 | file1.orig | |
|
211 | file2.orig | |
|
200 | 212 | $ grep '<<<' file1 > /dev/null |
|
201 | 213 | $ grep '<<<' file2 > /dev/null |
|
202 | 214 |
General Comments 0
You need to be logged in to leave comments.
Login now