[Bug 213179] New: "osc up" discards changes in local files
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.
https://bugzilla.novell.com/show_bug.cgi?id=213179 poeml@novell.com changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |NEEDINFO Info Provider| |suse-beta@cboltz.de ------- Comment #1 from poeml@novell.com 2006-10-17 23:40 MST ------- I would need a *clear* how-to-reproduce for this. Because this is expected to work in the way you describe. But in fact, I suspect this could be a misunderstanding. 'G' means that the upstream changed could be merged with your local changes. Putting in conflict state works, as shown in the following transcript (demonstrated with two changes which can NOT be merged): poeml@batavia510 ~/bs/home:poeml/test3 % l total 600 -rw-r--r-- 1 poeml suse 0 2006-07-03 10:37 bla2 -rw-r--r-- 1 poeml suse 1026 2006-10-13 11:21 fstab -rw-r--r-- 1 poeml suse 970 2006-09-29 16:10 fstab~ -rw-r--r-- 1 poeml suse 302580 2006-06-28 23:46 wfmath-0.3.4.tar.bz2 -rw-r--r-- 1 poeml suse 302580 2006-06-28 23:46 wfmath-0.3.4.tar.bz2-ok poeml@batavia510 ~/bs/home:poeml/test3 % osc up At revision 56. poeml@batavia510 ~/bs/home:poeml/test3 % echo foo >> fstab poeml@batavia510 ~/bs/home:poeml/test3 % cd /tmp poeml@batavia510 /tmp % osc co home:poeml test3 A home:poeml A home:poeml/test3 A home:poeml/test3/bla2 A home:poeml/test3/fstab A home:poeml/test3/wfmath-0.3.4.tar.bz2 A home:poeml/test3/wfmath-0.3.4.tar.bz2-ok poeml@batavia510 /tmp % echo bar >> home:poeml/test3/fstab poeml@batavia510 /tmp % osc ci home:poeml/test3/fstab Sending fstab Transmitting file data . poeml@batavia510 /tmp % cd - ~/bs/home:poeml/test3 poeml@batavia510 ~/bs/home:poeml/test3 % osc ci Working copy '/suse/poeml/pac/opensuse/home:poeml/test3' is out of date (rev 56 vs rev 57). Looks as if you need to update it first. [1] 16612 exit 1 osc ci poeml@batavia510 ~/bs/home:poeml/test3 % osc up C fstab At revision 57. poeml@batavia510 ~/bs/home:poeml/test3 % l fstab* -rw-r--r-- 1 poeml suse 1083 2006-10-18 07:36 fstab -rw-r--r-- 1 poeml suse 970 2006-09-29 16:10 fstab~ -rw-r--r-- 1 poeml suse 1030 2006-10-18 07:35 fstab.mine -rw-r--r-- 1 poeml suse 1030 2006-10-18 07:35 fstab.r57 poeml@batavia510 ~/bs/home:poeml/test3 % -- 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.
https://bugzilla.novell.com/show_bug.cgi?id=213179 ------- Comment #2 from poeml@novell.com 2006-10-17 23:57 MST ------- BTW, this is independent from linked packages. Files in linked packages are treated as normal files. -- 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.
https://bugzilla.novell.com/show_bug.cgi?id=213179 ------- Comment #3 from suse-beta@cboltz.de 2006-10-18 15:28 MST ------- (In reply to comment #1)
I would need a *clear* how-to-reproduce for this.
.. and I would be very happy if I could provide one - unfortunately I don't know exactly when/why this happens :-( Therefore I let this bug in NEEDINFO state until I have an idea what causes this bug. -- 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.
https://bugzilla.novell.com/show_bug.cgi?id=213179 ------- Comment #4 from poeml@novell.com 2006-11-06 09:35 MST ------- Did you ever see it again? -- 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.
https://bugzilla.novell.com/show_bug.cgi?id=213179 ------- Comment #5 from suse-beta@cboltz.de 2006-11-06 17:01 MST ------- no, but I didn't have much time to use the buildservice since my last comment. If you want to close this as worksworme, it's ok for me - I'll repoen if it ever happens again. It's also ok to leave the bug in needinfo state - your choice ;-) -- 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.
https://bugzilla.novell.com/show_bug.cgi?id=213179 poeml@novell.com changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEEDINFO |RESOLVED Info Provider|suse-beta@cboltz.de | Resolution| |WORKSFORME ------- Comment #6 from poeml@novell.com 2006-11-07 01:50 MST ------- Just reopen it if necessary. Thanks. -- 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.
https://bugzilla.novell.com/show_bug.cgi?id=213179 suse-beta@cboltz.de changed: What |Removed |Added ---------------------------------------------------------------------------- Status|RESOLVED |CLOSED ------- Comment #7 from suse-beta@cboltz.de 2007-01-26 15:06 MST ------- I did not see this bug again (might be caused by little packaging activity). And I saw your announcement that you fixed a osc bug that sounds similar to this one. -> CLOSED -- 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.
https://bugzilla.novell.com/show_bug.cgi?id=213179 ------- Comment #8 from poeml@novell.com 2007-01-29 01:52 MST ------- Yes, I also assume that this was the bug... thank you! -- 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.
participants (1)
-
bugzilla_noreply@novell.com