mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-02-24 03:02:12 +01:00
Code

fix update of working copy when adding file from upstream which is missing locally

Browse Source
This commit is contained in:
Dr. Peter Poeml 2006-05-29 21:04:14 +00:00
parent 4671c647ba
commit 2e8d12af7e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osc/commandline.py
View File

@ -358,7 +358,7 @@ usage: up
for filename in p.filenamelist:
state = p.status(filename)
if p.findfilebyname(filename).md5 == oldp.findfilebyname(filename).md5:
if state == 'M' and p.findfilebyname(filename).md5 == oldp.findfilebyname(filename).md5:
# no merge necessary... local file is changed, but upstream isn't
pass
elif state == 'M' and filename in saved_modifiedfiles: