Show More
@@ -610,7 +610,7 b' def origpath(ui, repo, filepath):' | |||||
610 |
|
610 | |||
611 | origvfs.makedirs(origbackupdir) |
|
611 | origvfs.makedirs(origbackupdir) | |
612 |
|
612 | |||
613 | if origvfs.isdir(filepathfromroot): |
|
613 | if origvfs.isdir(filepathfromroot) and not origvfs.islink(filepathfromroot): | |
614 | ui.note(_('removing conflicting directory: %s\n') |
|
614 | ui.note(_('removing conflicting directory: %s\n') | |
615 | % origvfs.join(filepathfromroot)) |
|
615 | % origvfs.join(filepathfromroot)) | |
616 | origvfs.rmtree(filepathfromroot, forcibly=True) |
|
616 | origvfs.rmtree(filepathfromroot, forcibly=True) |
@@ -110,18 +110,12 b' Perform an update that causes b/c and d ' | |||||
110 | creating directory: $TESTTMP/repo/.hg/origbackups/b (glob) |
|
110 | creating directory: $TESTTMP/repo/.hg/origbackups/b (glob) | |
111 | removing conflicting file: $TESTTMP/repo/.hg/origbackups/b (glob) |
|
111 | removing conflicting file: $TESTTMP/repo/.hg/origbackups/b (glob) | |
112 | getting d |
|
112 | getting d | |
113 | removing conflicting directory: $TESTTMP/repo/.hg/origbackups/d (glob) |
|
|||
114 | abort: None |
|
|||
115 | [255] |
|
|||
116 |
|
||||
117 | Workaround issue by deleting d: |
|
|||
118 |
|
||||
119 | $ rm d |
|
|||
120 | $ hg up c1 |
|
|||
121 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
113 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
122 | (activating bookmark c1) |
|
114 | (activating bookmark c1) | |
123 | $ cat .hg/origbackups/b/c |
|
115 | $ cat .hg/origbackups/b/c | |
124 | c4 |
|
116 | c4 | |
|
117 | $ cat .hg/origbackups/d | |||
|
118 | d3 | |||
125 | $ ls ../sym-link-target |
|
119 | $ ls ../sym-link-target | |
126 |
|
120 | |||
127 | Incorrectly configure origbackuppath to be under a file |
|
121 | Incorrectly configure origbackuppath to be under a file |
General Comments 0
You need to be logged in to leave comments.
Login now