Resolving diverged branches in Subversion repository

[Ben Finney]

Jelmer Vernooij <jelmer at samba.org> writes:

> Am Sonntag, den 22.06.2008, 10:25 -0500 schrieb John Arbash Meinel:
> > Another possibility comes to mind. You could continue to use bzr-svn as
> > you are, except when it comes time to integrate your feature changes
> > back into trunk.
> > 
> > cd trunk
> > bzr merge ../feature_A
> > bzr revert --forget-merges
> > svn commit -m "feature A"
> > bzr up
> > 
> > I'm not 100% sure how the svn/bzr stuff works in an SVN checkout. I'm
> > told it *does* work.

> This won't work because "bzr merge" needs to pull the merged revisions
> into the repository of the branch you're merging into and that doesn't
> work with Subversion repositories.

Could I not maintain the Subversion trunk checkout with *both* the
Subversion client and the Bazaar client, letting Bazaar believe this
is an ordinary working tree?

That is, without expecting either of them to maintain each other's VCS
data. I'd be manually updating two VCSes for the one tree, but it
would be *only* one tree: the trunk checkout.

That would, at least, allow me to use Bazaar to keep track of merging
changes to/from feature branches, but then use Subversion to commit
the resulting trunk working tree to the Subversion repository.

-- 
 \      "Saying that Java is nice because it works on all OSes is like |
  `\     saying that anal sex is nice because it works on all genders" |
_o__)                                                —http://bash.org/ |
Ben Finney