Show More
@@ -201,7 +201,7 b' def dorecord(ui, repo, commitfunc, cmdsu' | |||||
201 | newlyaddedandmodifiedfiles] |
|
201 | newlyaddedandmodifiedfiles] | |
202 | backups = {} |
|
202 | backups = {} | |
203 | if tobackup: |
|
203 | if tobackup: | |
204 | backupdir = repo.join('record-backups') |
|
204 | backupdir = repo.vfs.join('record-backups') | |
205 | try: |
|
205 | try: | |
206 | os.mkdir(backupdir) |
|
206 | os.mkdir(backupdir) | |
207 | except OSError as err: |
|
207 | except OSError as err: | |
@@ -3412,7 +3412,7 b' def clearunfinished(repo):' | |||||
3412 | raise error.Abort(msg, hint=hint) |
|
3412 | raise error.Abort(msg, hint=hint) | |
3413 | for f, clearable, allowcommit, msg, hint in unfinishedstates: |
|
3413 | for f, clearable, allowcommit, msg, hint in unfinishedstates: | |
3414 | if clearable and repo.vfs.exists(f): |
|
3414 | if clearable and repo.vfs.exists(f): | |
3415 | util.unlink(repo.join(f)) |
|
3415 | util.unlink(repo.vfs.join(f)) | |
3416 |
|
3416 | |||
3417 | afterresolvedstates = [ |
|
3417 | afterresolvedstates = [ | |
3418 | ('graftstate', |
|
3418 | ('graftstate', |
General Comments 0
You need to be logged in to leave comments.
Login now