mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-01-11 16:36:14 +01:00
Code

- do_addremove: if a "deleted" file exists in the wc, track it again

Browse Source
This commit is contained in:
Marcus Huewe 2014-10-21 22:31:30 +02:00
parent 26ffaa9de8
commit 27bdf6cbdd
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osc/commandline.py
View File

@ -4281,6 +4281,9 @@ Please submit there instead, or use --nodevelproject to force direct submission.
if state == '?': if state == '?':
# TODO: should ignore typical backup files suffix ~ or .orig # TODO: should ignore typical backup files suffix ~ or .orig
p.addfile(filename) p.addfile(filename)
elif state == 'D' and os.path.isfile(abs_filename):
# if the "deleted" file exists in the wc, track it again
p.addfile(filename)
elif state == '!': elif state == '!':
p.delete_file(filename) p.delete_file(filename)
print(statfrmt('D', getTransActPath(os.path.join(p.dir, filename)))) print(statfrmt('D', getTransActPath(os.path.join(p.dir, filename))))