[Bug 492366] New: inexplicable local modifications ?
http://bugzilla.novell.com/show_bug.cgi?id=492366 User mmeeks@novell.com added comment http://bugzilla.novell.com/show_bug.cgi?id=492366#c1 Summary: inexplicable local modifications ? Classification: openSUSE Product: openSUSE.org Version: unspecified Platform: Other OS/Version: Other Status: NEW Severity: Major Priority: P5 - None Component: BuildService AssignedTo: bnc-team-screening@forge.provo.novell.com ReportedBy: mmeeks@novell.com QAContact: adrian@novell.com Found By: --- Not knowing how best to resolve _linkerrors, I tried this: $ osc up -e Expanding to rev c6ae3317f02851279bcbd2f6cc6a71bc D _link D project.diff D project1.diff D project2.diff A _linkerror At revision c6ae3317f02851279bcbd2f6cc6a71bc. $ cat _linkerror applying patch project.diff patching file kernel-default.spec patching file linux-2.6-build-nonintconfig.patch patching file linux-2.6.19-modesetting-by-default.patch patching file linux-2.6.29-dont-wait-for-mouse.patch patching file linux-2.6.29-drm-fence-fix.patch patching file linux-2.6.29-drm-revert.patch patching file linux-2.6.29-enable-async-by-default.patch patching file linux-2.6.29-fast-initrd.patch patching file linux-2.6.29-flip-ide-net.patch patching file linux-2.6.29-input-introduce-a-tougher-i8042.reset.patch patching file linux-2.6.29-jbd-longer-commit-interval.patch patching file linux-2.6.29-msiwind.patch patching file linux-2.6.29-retry-root-mount.patch patching file linux-2.6.29-silence-acer-message.patch patching file linux-2.6.29-sreadahead.patch applying patch project1.diff patching file kernel-default.spec Hunk #1 FAILED at 62. 1 out of 6 hunks FAILED -- saving rejects to file .rejects could not apply patch 'project1.diff' $ ls _linkerror $ osc up -u osc: cannot expand/unexpand because your working copy has local modifications. Please remove them and try again $ ls _linkerror $ rm _linkerror $ osc up -u osc: cannot expand/unexpand because your working copy has local modifications. Please remove them and try again $ ls -a .. .osc $ osc up -u osc: cannot expand/unexpand because your working copy has local modifications. Please remove them and try again It is *highly* unclear to me what the local modifications are: I fairly often get similar messages - around a hyper-sensitivity to (non-existent) local modifications which is particularly painful with a large package where re-checking it out takes some minutes. Any chance of making this more relaxed ? :-) Thanks. -- Configure bugmail: http://bugzilla.novell.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug.
http://bugzilla.novell.com/show_bug.cgi?id=492366 User mmeeks@novell.com added comment http://bugzilla.novell.com/show_bug.cgi?id=492366#c1 --- Comment #1 from Michael Meeks <mmeeks@novell.com> 2009-04-06 04:40:14 MDT --- Another sub-par interaction would be this [ from inside Nurnberg FWIW ]: $ vi _link $ osc commit Sending _link Transmitting file data . Committed revision 9. Server returned an error: HTTP Error 500: Internal Server Error execution expired $ osc diff Index: _link =================================================================== $ osc up -e Expanding to rev 6efa5ca4899d18953629ee3b10ffd2ec osc: cannot expand/unexpand because your working copy has local modifications. Please remove them and try again $ osc diff Index: _link =================================================================== $ osc commit Working copy '/suse/mmichael/osc/home:michael_meeks:netbook/kernel-default' is out of date (rev 8 vs rev 9). Looks as if you need to update it first. ie. the commit failed, apparently I need to update; so then I try to update: $ osc up At revision 9. $ osc up -e .. and now it continues as expected [ until it fails on the broken patch that is ;-] ... hmm. -- Configure bugmail: http://bugzilla.novell.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug.
http://bugzilla.novell.com/show_bug.cgi?id=492366 User suse-tux@gmx.de added comment http://bugzilla.novell.com/show_bug.cgi?id=492366#c2 Marcus Hüwe <suse-tux@gmx.de> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |suse-tux@gmx.de --- Comment #2 from Marcus Hüwe <suse-tux@gmx.de> 2009-04-06 14:21:56 MDT --- (In reply to comment #0)
It is *highly* unclear to me what the local modifications are:
What's the output of "osc status"?
I fairly often get similar messages - around a hyper-sensitivity to (non-existent) local modifications which is particularly painful with a large package where re-checking it out takes some minutes.
Any chance of making this more relaxed ? :-)
It is just an ugly workaround for #399247 otherwise it might screw up the working copy. Unfortunately there's no real fix for it atm because it would involve a rewrite of osc's internal file tracking. -- Configure bugmail: http://bugzilla.novell.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug.
http://bugzilla.novell.com/show_bug.cgi?id=492366 Peter Poeml <poeml@cmdline.net> changed: What |Removed |Added ---------------------------------------------------------------------------- AssignedTo|poeml@novell.com |bnc-team-screening@forge.pr | |ovo.novell.com -- Configure bugmail: http://bugzilla.novell.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug.
http://bugzilla.novell.com/show_bug.cgi?id=492366 zhu rensheng <rszhu@novell.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |rszhu@novell.com AssignedTo|bnc-team-screening@forge.pr |adrian@novell.com |ovo.novell.com | -- Configure bugmail: http://bugzilla.novell.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug.
https://bugzilla.novell.com/show_bug.cgi?id=492366 https://bugzilla.novell.com/show_bug.cgi?id=492366#c4 Adrian Schröter <adrian@suse.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |FIXED --- Comment #4 from Adrian Schröter <adrian@suse.com> 2012-03-29 11:58:46 UTC --- the branch handling should have improved this. -- 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.
participants (1)
-
bugzilla_noreply＠novell.com