[PATCH] push to diverged branch
Matthieu.Moy at imag.fr
Tue Oct 10 15:15:00 BST 2006
"Erik Bågfors" <zindar at gmail.com> writes:
> I now get the message 'Try using "merge" and then "push"', so I do that
> bzr merge
> 2000 revision has been merged
> Since I know something about bzr i run commit, eventhough the message
> didn't tell me to (shouldn't it?)
> I have now merged these 2000 revisions into my 2 revision feature-branch
> bzr push
> And suddenly, I've converted the last 2000 revisions of trunk into
> something that's merge in.
It's obviously not perfect, but I don't think we have any better
solution right now. There was a thread about allowing a "merge
--reverse" or I don't remember which better name people came up with,
but it's not implemented now.
And I'd argue that it's at least better that what we have now.
More information about the bazaar