Hello Krzysztof. Thanks very much. I update the branch and tell in the list the number of the previous branch whith old staff for posibol regression. Hi, Jabier.
On Wed, 2012-11-14 at 13:36 +0100, Jabier Arraiza wrote:
Im new to develop whith BZR. I develop a branch, and after i made a
lot
of changes on the branch but i want to know what version of code is better. What i do? 2 branches or update original branch whith the new code. The new code is more powerful but im not sure is ok whith the
filosophy
of inkscape, because made more changes to the code and change some behviors on usage.
If you want to compare a branch, to let's say trunk you can do that using bzr by specifying the branch. So:
$ bzr diff --new lp:inkscape
Would compare to trunk. Usually I find it useful to compare to the common ancestor as the diff is a bit cleaner:
$ bzr diff -r ancestor:lp:inkscape
If you'd like to update your branch to include the changes that are on trunk currently you can just merge them in. No need to worry about rebasing or anything like that, Bazaar handles it for you.
$ bzr merge lp:inkscape $ bzr commit -m "Updating to trunk"
It's difficult to know which is "better", but hopefully that helps you figuring out the information you need.
This information could be added to our Bazaar tutorial: http://wiki.inkscape.org/wiki/index.php/Working_with_Bazaar
Regards, Krzysztof