On Tue, Jan 19, 2010 at 01:46:26PM +0100, Vincent Untz wrote:
Le mardi 19 janvier 2010, à 12:59 +0100, Stephan Kulow a écrit :
If you change the license tag too, you create a merge conflict (and this is about the only way to make a branch "broken"). To avoid this, you can use osc pull to pull the O:F changes explicitly into your project.
So it leads me to a few other questions/comments:
+ is there an easy way to know that there's something to pull?
The "expanded" sources (i.e. the sources that you normally work with) are always "pulled". So "autopull" is true as default setting. You can change this vie the "linkcontrol" flag in that latest osc versions. If "linkcontrol" is set to true, you stay with the last committed version and need "osc pull" to update to the latest link target version. If "linkcontrol" is false you do not need "osc pull" at all. (The last sentence is actually a lie, latest osc versions will automatically switch to "linkcontrol true" for the local packae if the link is broken to give you an easy way to repair links.) Cheers, Michael. -- Michael Schroeder mls@suse.de SUSE LINUX Products GmbH, GF Markus Rex, HRB 16746 AG Nuernberg main(_){while(_=~getchar())putchar(~_-1/(~(_|32)/13*2-11)*13);} -- To unsubscribe, e-mail: opensuse-packaging+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-packaging+help@opensuse.org