CODEWITHSUNDEEP
bazaar
justintime
justintime

Reputation: 3631

Is there a way of finding out what a bazaar update would do

Is theere a way of finding out what changes a bzr update will do without actually doing it. Specifially I would like to have a bit of warning if there is going to be a conflict.

Upvotes: 2

Views: 118

Answers (1)

Karl Bielefeldt
Karl Bielefeldt

Reputation: 49108

Not directly that I'm aware of, that's what bzr revert is for. However, there is a common way to structure your local branches to help. I use one local branch that mirrors the central branch, then I branch off of that for my work. When I'm ready to "check in," I update my local mirror branch, which always succeeds without conflicts because I haven't changed my working copy of that branch. Then I merge my feature branch into my local mirror branch, then push my local mirror branch to the central repository.

The advantage of this setup in your case is you could use bzr merge --preview or bzr diff to see the changes if you don't want to actually try the merge. I personally prefer just to revert the merge until the conflicts are fixed either upstream or in my local feature branch.

Upvotes: 3

Related Questions