Launchpad-branch: merging with

joejoe2010

Hello everybody,

I've got a question. If I have a branch on launchpad and then want to get my branch uptodate with trunk then I do a
bzr merge bzr.openpetra.org:8008/openpetra/trunk as described https://sourceforge.net/apps/mediawiki/openpetraorg/index.php?title=How_to_commit_to_launchpad

If I then go on making changes on my branch and then want to commit my branch to launchpad then not only my changes are commited but aswell all the other changes that have been done by someoneelse in trunk in the meantime.

Is there a way to avoid this or rather can you when you merge my branch into trunk distinguish which changes were made by me and which by other people?

Greetings
Joachim

joejoe2010

a "bzr info" gives me:

Repository checkout (format: 2a)
Location:
repository checkout root: .
checkout of branch: [bzr+ssh://bazaar.launchpad.net/_jomamme ... packaging/](bzr+ssh://bazaar.launchpad.net/~jomammele/openpetraorg/debian-packaging/)
shared repository: /media/13A3F31013995A69/openpetra

Related branches:
push branch: [bzr+ssh://bazaar.launchpad.net/_jomamme ... packaging/](bzr+ssh://bazaar.launchpad.net/~jomammele/openpetraorg/debian-packaging/)
submit branch: [bzr+ssh://bazaar.launchpad.net/%2Bbranch/openpetraorg/](bzr+ssh://bazaar.launchpad.net/%2Bbranch/openpetraorg/)

pokorra

Hello Joachim,

bzr merge is different than eg. git merge.
This is actually one of the reasons why we have switched to bazaar: you are in complete control!
This means, bzr will never commit things without you initiating it.

When you do a merge, you have to commit the merge in a second step to your branch.
This is also the reason why Bazaar does not allow merging if you still have uncommitted changes in your branch.

I hope this makes sense.

Timotheus