Topic: Bazaar won't update branch
GunChleoc Topic Opener |
Posted at: 2014-01-22, 09:15
I tried to do some work on https://code.launchpad.net/~widelands-dev/widelands/bug-1074353, but since there have been some changes done by someone else I need to grab those. I tried So I did a All the documentation I have read assumes that you create a new branch and then work on it on your own and pull in changes from trunk, but not for the branch. I did grab changes from branches before, but I can't remember how I managed to do that Busy indexing nil values Top Quote |
SirVer |
Posted at: 2014-01-23, 05:51
Well, as soon as you have branched something you should no longer pull from trunk. only pull from the branch and only push to the branch. if you need something from master, you should merge that in. So in your case your starting workflow should look something like this:
the --remember means that you can just write bzr push or bzr pull in the future. Hope this helps. Top Quote |
GunChleoc Topic Opener |
Posted at: 2014-01-23, 09:48
$ bzr commit -m "Merged master." - this implies that I merged master? The point of my question is that I don't want to get the master, i just want to get the updates for the branch. And for future reference: I take it that I'd have to change the remember every time I switch the branch I'm working on? Busy indexing nil values Top Quote |
SirVer |
Posted at: 2014-01-24, 10:22
Yes, the two commands:
are the commands to merge master, the first pulls in the changes, the second creates the merge commit (this is different to for example git, where the first command already creates the merge commit).
Right, I misunderstood. Then you only need the pull command.
That depends on how you switch. If you use bzr switch then no - each branch has its own history of its parents, so you should not need the remember each time. Top Quote |