Just wanted to do something useful again this morning :)
has now a new special merge tool installed,
which will be used to merge suse style changelog files (<package>.changes).
This is supposed to solve the typical breakage when you branch from some
package and upstream and you are applying modifications.
While most modifications can just get merged, the .changes file
always lead to a broken package. This was because the diff3 tool,
which we use (as almost every other SCM) does not understand the
format of it and just saw conflicting lines.
.changes files are now merged by the new bs_mergechanges
tool. It is merging by parsing the files and sorting by timestamps.
In case it does still fail, eg. upstream and you did change an existing
entry in different ways, the standard diff3 tool will be used to display
You do not need to update any client tools, osc will get the merged files
directly from the source server.
In short, most of you will not even notice a difference to before. You will
just see less often merge conflicts in your branches.
Already existing conflicts from the time before deployment will be detected
automatically over the next days. But it takes some time.
SUSE LINUX GmbH, GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer, HRB 21284 (AG
To unsubscribe, e-mail: opensuse-packaging+unsubscribe(a)opensuse.org
To contact the owner, e-mail: opensuse-packaging+owner(a)opensuse.org