[opensuse-buildservice] osc 0.117 with "repairlink" and "changelog" support
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. http://download.opensuse.org/repositories/openSUSE:/Tools/ I hope this makes your life much easier now :) bye adrian -- Adrian Schroeter SUSE Linux Products GmbH email: adrian@suse.de -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-buildservice+help@opensuse.org
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 file.
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-- ... :wga sending... $ Behavior of osc ci -m "" remains unchanged. Regards Michal Vyskocil -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-buildservice+help@opensuse.org
I am noticing a problem with linking when using 0.117: when I checkin changes on local obs server: Transmitting file data .Server returned an error: HTTP Error 404: Not Found /srv/obs/sources/libva/754a44109bca004bca345b21424268ac-/LINK: No such file or directory Any idea if that is a regression in 0.117? Anas On 23-Apr-09, at 10:25 AM, 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 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.
http://download.opensuse.org/repositories/openSUSE:/Tools/
I hope this makes your life much easier now :)
bye adrian
--
Adrian Schroeter SUSE Linux Products GmbH email: adrian@suse.de
-- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-buildservice+help@opensuse.org
-- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-buildservice+help@opensuse.org
Hi Anas, Am Montag, 27. April 2009 02:20:17 schrieb Anas Nashif:
I am noticing a problem with linking when using 0.117:
when I checkin changes on local obs server:
Transmitting file data .Server returned an error: HTTP Error 404: Not Found /srv/obs/sources/libva/754a44109bca004bca345b21424268ac-/LINK: No such file or directory
The /LINK looks a bit wrong to me at this place. However, I can not reproduce it here. Can you send the output of "osc -d linkpac..." and double check that you do not have any wrong source server ? Given that we changed also the source server in this code area, we might have introduced an incompatible change :/ Which version of the source server do you use ? bye adrian -- Adrian Schroeter SUSE Linux Products GmbH email: adrian@suse.de -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-buildservice+help@opensuse.org
Adrian, I am running 1.6beta2, and linking with -d does not show anything mysterious. I noticed several changes were made to bs_srcserver after beta2 and up to the time osc 117 was released that some affect the linking, could this be the reason? Anas On 27-Apr-09, at 1:49 AM, Adrian Schröter wrote:
Hi Anas,
Am Montag, 27. April 2009 02:20:17 schrieb Anas Nashif:
I am noticing a problem with linking when using 0.117:
when I checkin changes on local obs server:
Transmitting file data .Server returned an error: HTTP Error 404: Not Found /srv/obs/sources/libva/754a44109bca004bca345b21424268ac-/LINK: No such file or directory
The /LINK looks a bit wrong to me at this place. However, I can not reproduce it here.
Can you send the output of "osc -d linkpac..." and double check that you do not have any wrong source server ?
Given that we changed also the source server in this code area, we might have introduced an incompatible change :/
Which version of the source server do you use ?
bye adrian
--
Adrian Schroeter SUSE Linux Products GmbH email: adrian@suse.de
-- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-buildservice+help@opensuse.org
-- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-buildservice+help@opensuse.org
Am Donnerstag, 14. Mai 2009 19:19:16 schrieb Anas Nashif:
Adrian, I am running 1.6beta2, and linking with -d does not show anything mysterious. I noticed several changes were made to bs_srcserver after beta2 and up to the time osc 117 was released that some affect the linking, could this be the reason?
right, there was a bugfix for this. bye adrian
Anas
On 27-Apr-09, at 1:49 AM, Adrian Schröter wrote:
Hi Anas,
Am Montag, 27. April 2009 02:20:17 schrieb Anas Nashif:
I am noticing a problem with linking when using 0.117:
when I checkin changes on local obs server:
Transmitting file data .Server returned an error: HTTP Error 404: Not Found /srv/obs/sources/libva/754a44109bca004bca345b21424268ac-/LINK: No such file or directory
The /LINK looks a bit wrong to me at this place. However, I can not reproduce it here.
Can you send the output of "osc -d linkpac..." and double check that you do not have any wrong source server ?
Given that we changed also the source server in this code area, we might have introduced an incompatible change :/
Which version of the source server do you use ?
bye adrian
Adrian Schroeter SUSE Linux Products GmbH email: adrian@suse.de
-- Adrian Schroeter SUSE Linux Products GmbH email: adrian@suse.de -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-buildservice+help@opensuse.org
participants (3)
-
Adrian Schröter -
Anas Nashif -
Michal Vyskocil