Am Montag, 20. April 2009 11:55:08 schrieb Michael Matz:
Hi,
On Mon, 20 Apr 2009, Adrian Schröter wrote:
You can already get the latest working ancestor via the API via lastworking=1 parameter. (something what the osc merge support will use). But it is true that this is not necessary the same version where the automatic created patch in source links has been created from.
So it might become an option in future to do the different merge order as Andreas has described. Practically it means the submitter has to adapt the changes made by other people to get his stuff working again. We will see if this works better or not.
That's confused. The three-way merge helps the submitter to adapt his own changes faster and easier to the changes coming from the link target packages.
This is not about refusing a three-way merge, this will happen with "osc merge" also using the diff3 tool. What we discussed here was in the end the order how the changes get applied. bye adrian -- Adrian Schroeter SUSE Linux Products GmbH email: adrian@suse.de -- To unsubscribe, e-mail: opensuse-packaging+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-packaging+help@opensuse.org