http://bugzilla.novell.com/show_bug.cgi?id=598615
http://bugzilla.novell.com/show_bug.cgi?id=598615#c1
Adrian Schröter changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|NEW |NEEDINFO
CC| |suse-tux@gmx.de
InfoProvider| |mmeeks@novell.com
--- Comment #1 from Adrian Schröter 2010-04-22 08:48:47 UTC ---
why do you remove the conflicting file ? You could just move on off the other
files, which are checked out beside.
"osc update" is not restoring the file, because it is declared as conflicted.
So you need to declare the conflict as resolved first. After that "osc up" will
also restore the file again. This is IMHO exactly the same as svn and git is
doing it.
The file must be stored in the system with history to guarantee that we get the
original source for a package, independend if some upstream server got screwed
up or not.
But we will allow server and client side downloads from original side via
source services soon.
--
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.