2014-03-11 0:50 GMT+01:00 Jabiertxo Arraiza Cenoz <jabier.arraiza@...2893...>:
Hello, I have a question to use bazaar:
I'm working on a custom branch in a launchpad team, I'm owner. I have a local repository, using like:
*bzr merge from Inkscape trunk *?bzr resolve *bzr commit -m "Update to trunk" *change code in my local branch.. *bzr commit -m "Some changes to branch" *bzr push to the branch in the teamAfter now, never have problems but now there is more people working on, and I want to know whats the way to be sync.
For example if I merge from the team like this: *other user PUSH some code to the branch in the team *bzr merge from branch in the team *bzr commit -m "Adding other user updates" *bzr push to the branch in the team This remove the other user push/es and be replaced well, but for my user, removing other user pushes. I think this is wrong.
It is not removing the pushes, it is just changing the revision numbers so that the other users' pushes are in subrevisions.
Any body know a good way to archive ok? Thanks in advance, and sorry if not enought clear.
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
(PS: If anyone knows how to merge without having a checkout of the merge target, I'd like to know)
Regards, Krzysztof