bzr-svn 0.3 - Other weird errors
jelmer at samba.org
Fri Jan 19 17:22:48 GMT 2007
On Fri, 2007-01-19 at 18:15 +0100, Nicholas Allen wrote:
> Jelmer Vernooij wrote:
> > On Fri, 2007-01-19 at 18:07 +0100, Nicholas Allen wrote:
> >> Just to point out that once you get into this state there is no way out.
> >> I resolved the conflicts committed and the pushed. But push told me that
> >> the branches had diverged and I need to merge (but my commit was from a
> >> merge so I should be up to date with the svn repo). If I try to merge it
> >> tells me there is nothing to do. So I need to merge to push but I have
> >> already merged and merge doesn't change anything. Once you get into this
> >> state I don't see how you can get your code into the svn repo.
> > You should always be able to do a 'bzr revert' to clean up the list of
> > pending merges.
> Also if I resolve conflict and commit there is no way to revert after
> that point. So there is no way out of this loop - at least I have tried
> everything I can think of but there is no way to commit the changes back
> to svn.
You should be able to uncommit and then revert. It's only possible to
push revisions to a Subversion repository on top of an existing revision
(because the mainline in Subversion as opposed to Bazaar can't be
Jelmer Vernooij <jelmer at samba.org> - http://samba.org/~jelmer/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Size: 307 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070119/18c84447/attachment-0001.pgp
More information about the bazaar