Mailinglist Archive: opensuse-buildservice (250 mails)

< Previous Next >
Re: [opensuse-buildservice] osc 0.117 with "repairlink" and "changelog" support
  • From: Michal Vyskocil <mvyskocil@xxxxxxx>
  • Date: Thu, 23 Apr 2009 16:41:28 +0200
  • Message-id: <200904231641.28698.mvyskocil@xxxxxxx>
On Thursday 23 of April 2009 16:25:45 Adrian Schröter wrote:
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

An alternative solution to maintain the changelog is to call "buildvc"
directly, which gets provided by the also released build.rpm

In fact osc vc don't do anything like that :). It just runs Ludwig's buildvc
(so you need also new version of build.rpm installed). It just adds an
implicit email (from user meta, or ~/.oscrc - see osc vc --help), that's only
one difference from buildvc.

And I added -e option to both osc vc and buildvc, so you can just open the
changes without new header added.

I suppose that Adrian means changed behavior of osc commit. It fills a
differences in .changes to commit message, so workflow is

$ osc co package
$ vim some_file
$ osc vc -m "foo bar"
$ osc ci
- foo bar
--This line, and those below, will be ignored--

Behavior of osc ci -m "" remains unchanged.

Michal Vyskocil
To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-buildservice+help@xxxxxxxxxxxx

< Previous Next >