[opensuse-buildservice] New branch & merge handling in OBS (more git like)
Hi, please read this news posting about the new branch handling of OBS. http://news.opensuse.org/2010/01/11/obs-supports-new-branch-and-merge-handli... We just activated this new mode on api.opensuse.org. So this means you may be surprised when you look into a package you just created with "osc branch". There are no _link + project.diff files anymore, but a full copy of all files plus an additional _link file. Please read the blog and ask questions here :) thanks adrian -- Adrian Schroeter SUSE Linux Products GmbH email: adrian@suse.de -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-buildservice+help@opensuse.org
Sorry ... somehow I messed up (or missed) the deployment yesterday. (Too many rival processes ...) It is activated now for sure. In case you did not understand yesterday what I was speaking about actually, please re-try now :) sorry again adrian Am Montag, 11. Januar 2010 17:38:20 schrieb Adrian Schröter:
Hi,
please read this news posting about the new branch handling of OBS.
http://news.opensuse.org/2010/01/11/obs-supports-new-branch-and-merge-handli...
We just activated this new mode on api.opensuse.org. So this means you may be surprised when you look into a package you just created with "osc branch". There are no _link + project.diff files anymore, but a full copy of all files plus an additional _link file.
Please read the blog and ask questions here :)
thanks adrian
-- Adrian Schroeter SUSE Linux Products GmbH email: adrian@suse.de -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-buildservice+help@opensuse.org
Adrian, Is this the same as "• Change the branch mechanism to use the diff3 approach instead of the _link + patch mechanism. " on the roadmap page that was scheduled for 2.0? Anas On 2010-01-11, at 11:38 AM, Adrian Schröter wrote:
Hi,
please read this news posting about the new branch handling of OBS.
http://news.opensuse.org/2010/01/11/obs-supports-new-branch-and-merge-handli...
We just activated this new mode on api.opensuse.org. So this means you may be surprised when you look into a package you just created with "osc branch". There are no _link + project.diff files anymore, but a full copy of all files plus an additional _link file.
Please read the blog and ask questions here :)
thanks adrian
--
Adrian Schroeter SUSE Linux Products GmbH email: adrian@suse.de
-- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-buildservice+help@opensuse.org
-- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-buildservice+help@opensuse.org
Am Donnerstag, 14. Januar 2010 21:46:21 schrieb Anas Nashif:
Adrian,
Is this the same as
"• Change the branch mechanism to use the diff3 approach instead of the _link + patch mechanism. "
on the roadmap page that was scheduled for 2.0?
Yes, that is the same. I have cleaned up the Roadmap. bye adrian
Anas
On 2010-01-11, at 11:38 AM, Adrian Schröter wrote:
Hi,
please read this news posting about the new branch handling of OBS.
http://news.opensuse.org/2010/01/11/obs-supports-new-branch-and-merge-handli...
We just activated this new mode on api.opensuse.org. So this means you may be surprised when you look into a package you just created with "osc branch". There are no _link + project.diff files anymore, but a full copy of all files plus an additional _link file.
Please read the blog and ask questions here :)
thanks adrian
-- Adrian Schroeter SUSE Linux Products GmbH email: adrian@suse.de -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-buildservice+help@opensuse.org
Adrian Schröter napsal(a):
Hi,
please read this news posting about the new branch handling of OBS.
http://news.opensuse.org/2010/01/11/obs-supports-new-branch-and-merge-handli...
We just activated this new mode on api.opensuse.org. So this means you may be surprised when you look into a package you just created with "osc branch". There are no _link + project.diff files anymore, but a full copy of all files plus an additional _link file.
Can the _link file now be renamed to _parent or something specific to branches, so that it's possible to branch real source links and submit changes against them? Michal -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-buildservice+help@opensuse.org
On Fri, Jan 15, 2010 at 11:55:51AM +0100, Michal Marek wrote:
Can the _link file now be renamed to _parent or something specific to branches, so that it's possible to branch real source links and submit changes against them?
No, a branch is just a normal link with one patch of type "branch". 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-buildservice+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-buildservice+help@opensuse.org
On Friday 15 January 2010 12:06:18 pm Michael Schroeder wrote:
On Fri, Jan 15, 2010 at 11:55:51AM +0100, Michal Marek wrote:
Can the _link file now be renamed to _parent or something specific to branches, so that it's possible to branch real source links and submit changes against them?
No, a branch is just a normal link with one patch of type "branch".
Yes? Then I don't understand what what Adrian meant in [1] when saying:
The new mechanism is doing a full copy of the sources, but still trace the origin via a _link file.
What am I misunderstanding? Thanks, Andreas [1] http://news.opensuse.org/2010/01/11/obs-supports-new-branch-and-merge- handling/ -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-buildservice+help@opensuse.org
On Fri, Jan 15, 2010 at 12:14:29PM +0100, Andreas Gruenbacher wrote:
On Friday 15 January 2010 12:06:18 pm Michael Schroeder wrote:
On Fri, Jan 15, 2010 at 11:55:51AM +0100, Michal Marek wrote:
Can the _link file now be renamed to _parent or something specific to branches, so that it's possible to branch real source links and submit changes against them?
No, a branch is just a normal link with one patch of type "branch".
Yes? Then I don't understand what what Adrian meant in [1] when saying:
The new mechanism is doing a full copy of the sources, but still trace the origin via a _link file.
What am I misunderstanding?
Nothing. A link of type branch is a full copy of the source with a _link file containing one patch element of type "branch". M. -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-buildservice+help@opensuse.org
On 01/15/2010 01:39 PM, Michael Schroeder wrote:
On Fri, Jan 15, 2010 at 12:14:29PM +0100, Andreas Gruenbacher wrote:
On Friday 15 January 2010 12:06:18 pm Michael Schroeder wrote:
On Fri, Jan 15, 2010 at 11:55:51AM +0100, Michal Marek wrote:
Can the _link file now be renamed to _parent or something specific to branches, so that it's possible to branch real source links and submit changes against them?
No, a branch is just a normal link with one patch of type "branch".
Yes? Then I don't understand what what Adrian meant in [1] when saying:
The new mechanism is doing a full copy of the sources, but still trace the origin via a _link file.
What am I misunderstanding?
Nothing. A link of type branch is a full copy of the source with a _link file containing one patch element of type "branch".
M.
Therefore a branch link is different to a normal package link and should have a different name, is this correct? Dave P -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-buildservice+help@opensuse.org
On Fri, Jan 15, 2010 at 01:49:34PM +0200, Dave Plater wrote:
Therefore a branch link is different to a normal package link and should have a different name, is this correct?
No, it's a normal link. It just doesn't use that "project.diff" mechanism. 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-buildservice+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-buildservice+help@opensuse.org
participants (6)
-
Adrian Schröter -
Anas Nashif -
Andreas Gruenbacher -
Dave Plater -
Michael Schroeder -
Michal Marek