[PEBKAC] Bzr mixing up branches?
sohail at worklogassistant.com
Fri Jan 30 19:50:30 GMT 2009
Marius Kruger wrote:
> 2009/1/30 Sohail Somani <sohail at worklogassistant.com
> <mailto:sohail at worklogassistant.com>>
> I'd say the fix would be "do what the user expected." In this case, I
> would *not* expect it to go to the master since I am working on the
> branch. Inter-branch operations should be done solely through merge imo.
> It seems that there are multiple ways to do the same thing which I
> personally can't appreciate.
> maybe doing the right thing for bound branches is to us the master
> branch for the push location.
I'm not sure I understand. Isn't that the problem in the first place?
> So... Note to self: use commit, update and merge only. Never use
> push/pull again.
> Is that more or less correct for me?
> yes when working with a checkout, use commit/update, not push/pull.
> Also, can you tell me how I can "unpull" these changes?
> use `bzr log master` to determine the revision you want to be at eg 15
> (where master is the url to your master branch)
> then do `bzr uncommit -r 15 --dry-run master` (I'm a bit paranoid so I
> normally test first)
> if everything looks good do `bzr uncommit -r 15 master`
Thank you. This helps me get back on track!
More information about the bazaar