2014-03-11 1:54 GMT+01:00 Jabiertxo Arraiza Cenoz <jabier.arraiza@...2893...>:
Thanks Krzysztof for the quick reply.
It is not removing the pushes, it is just changing the revision numbers so that the other users' pushes are in subrevisions.
I feel confortable by this way but think isn't the normal usage in inkscape trunk
If you want to prevent changes in revision numbers, use this:
bzr config -d lp:path/to/branch append_revisions_only=True
However if you set this, you won't be able to merge other users' changes and then push. Use this instead:
bzr checkout lp:path/to/branch working_dir <-- only the first time cd working_dir bzr update <-- after the first time bzr merge <path to your working tree> bzr commit
Another option - you need the "rebase" or "rewrite" plugin:
bzr pull bzr rebase bzr push
Think one of this ways is the best, but i have the extra problem to update the branch from trunk. Maybe this need to be done direcly in the launchpad branch instead merge from trunk localy and push. Is correct?
If you have your own branch on which you collaborate with a few users, you can just use a checkout. Instead of saying "bzr branch lp:path/to/branch" at the start, say "bzr checkout lp:path/to/branch". Then everything you commit will appear on Launchpad immediately, and to update you can simply say "bzr update".
You can also say "bzr bind :push" to convert an existing non-diverged branch into a checkout.
Regards, Krzysztof