A new osc release, version 0.117 is out. This one has as main features the long awaited "repairlink" functionality to fix broken source links due to conflicting source changes and also tool support to maintain the .changes file easier.
"osc repairlink" was implemented by Michael Schroeder. It checks out a package with merged source changes. It usesa 3-way merge to resolve file conflicts. After reviewing/repairing the merge, 'osc ci' will re-create a working source link.
"osc vc" was implemented by Michal Vyskocil and can collect commit messages to prepare a changelog entry in the .changes file. Please note that the entries there get read by users of the package, so commit messages like "get it building" or "yet another try to get the patch applied" are not helpfull for them and should get removed from the .changes file.
An alternative solution to maintain the changelog is to call "buildvc" directly, which gets provided by the also released build.rpm
There are also a number of bugfixes and improvements inside to make your life easier: * You do not need to specify project and package anymore on "osc getbinaries" when your cwd is a checkout package. * "osc branch" got a new option to define a different branch project name. * "osc branch" got a new option to checkout the package directly after branching * "osc co PACKAGE" works inside of a checked out project directory
You can find the latest version of osc and build rpms in openSUSE:Tools project as usual.
I hope this makes your life much easier now :)