https://bugzilla.novell.com/show_bug.cgi?id=213179 Summary: "osc up" discards changes in local files Product: openSUSE.org Version: unspecified Platform: Other OS/Version: Other Status: NEW Severity: Critical Priority: P5 - None Component: BuildService AssignedTo: poeml@novell.com ReportedBy: suse-beta@cboltz.de QAContact: adrian@novell.com "osc up" sometimes discards changes in local files. osc-0.9-11.1 (newest available version) Sometimes (dunno when/why exactly) I see on commit: (maildrop is just an example, IIRC I had this with "normal", non-linked packages also) # osc commit Working copy '/home/cb/packages/home:cboltz/maildrop' is out of date (rev 8 vs rev 9). Looks as if you need to update it first. (I'm quite sure that I did nod change files using the web interface etc.) Anyway, let's get the newest revision: # osc up G spec.patch At revision 9. The problem: I had modified spec.patch locally and osc downgraded it to the old version from the server, overwriting the changes I had done :-( Expected behaviour: If files have changed locally _and_ on the server, show a conflict message and (choose one ;-) a) put the conflicting parts into the file (cvs conflict style, possibly hard to implement and problematic with tarballs etc.) - or - b) move the local file to <filename>.conflict and download the file from the server - or - c) download the file from the server as <filename>.conflict> (I vote for b) ;-) -- Configure bugmail: https://bugzilla.novell.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug, or are watching someone who is.