Resolving diverged branches in Subversion repository

[Jelmer Vernooij]

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.

In other words, merge and revert don't work in native svn working
trees. 

Cheers,

Jelmer
-- 
Jelmer Vernooij <jelmer at samba.org> - http://samba.org/~jelmer/
Jabber: jelmer at jabber.fsfe.org