Mailinglist Archive: opensuse-packaging (100 mails)

< Previous Next >
Re: [opensuse-packaging] Source links semantics, broken links, and merging
  • From: Michael Matz <matz@xxxxxxx>
  • Date: Mon, 20 Apr 2009 11:55:08 +0200 (CEST)
  • Message-id: <Pine.LNX.4.64.0904201154220.29566@xxxxxxxxxxxxx>
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.


Ciao,
Michael.
< Previous Next >
Follow Ups