Show More
@@ -507,7 +507,7 b' def mergefiles(ui, repo, wctx, shelvectx' | |||
|
507 | 507 | # revert will overwrite unknown files, so move them out of the way |
|
508 | 508 | for file in repo.status(unknown=True).unknown: |
|
509 | 509 | if file in files: |
|
510 |
util.rename(file, file |
|
|
510 | util.rename(file, cmdutil.origpath(ui, repo, file)) | |
|
511 | 511 | ui.pushbuffer(True) |
|
512 | 512 | cmdutil.revert(ui, repo, shelvectx, repo.dirstate.parents(), |
|
513 | 513 | *pathtofiles(repo, files), |
@@ -1135,7 +1135,7 b' Test visibility of in-memory changes ins' | |||
|
1135 | 1135 | |
|
1136 | 1136 | $ cd .. |
|
1137 | 1137 | |
|
1138 | test Abort unshelve always gets user out of the unshelved state | |
|
1138 | test .orig files go where the user wants them to | |
|
1139 | 1139 | --------------------------------------------------------------- |
|
1140 | 1140 | $ hg init salvage |
|
1141 | 1141 | $ cd salvage |
@@ -1144,10 +1144,16 b' test Abort unshelve always gets user out' | |||
|
1144 | 1144 | $ echo '' > root |
|
1145 | 1145 | $ hg shelve -q |
|
1146 | 1146 | $ echo 'contADDent' > root |
|
1147 | $ hg unshelve -q | |
|
1147 | $ hg unshelve -q --config 'ui.origbackuppath=.hg/origbackups' | |
|
1148 | 1148 | warning: conflicts while merging root! (edit, then use 'hg resolve --mark') |
|
1149 | 1149 | unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') |
|
1150 | 1150 | [1] |
|
1151 | $ ls .hg/origbackups | |
|
1152 | root.orig | |
|
1153 | $ rm -rf .hg/origbackups | |
|
1154 | ||
|
1155 | test Abort unshelve always gets user out of the unshelved state | |
|
1156 | --------------------------------------------------------------- | |
|
1151 | 1157 | Wreak havoc on the unshelve process |
|
1152 | 1158 | $ rm .hg/unshelverebasestate |
|
1153 | 1159 | $ hg unshelve --abort |
General Comments 0
You need to be logged in to leave comments.
Login now