Resolving diverged branches in Subversion repository

[Jelmer Vernooij]

Am Montag, den 23.06.2008, 12:47 +1000 schrieb Ben Finney:
> Jelmer Vernooij <jelmer at samba.org> writes:
> 
> > Am Sonntag, den 22.06.2008, 17:54 +1000 schrieb Ben Finney:
> > > I would even be willing, if it were possible, to use the
> > > Subversion client to work only on merging feature branch changes
> > > into the trunk, and continue to use Bazaar on the feature branches
> > > and merging trunk changes into them. Is this workable?
> > You can of course just create your feature branches with bzr-svn
> By this, what operation do you mean? Currently, I branch from a Bazaar
> checkout of the Subversion repository. What does "create a feature
> branch with bzr-svn" mean?
Basically, "bzr branch <svn-repository-url>/trunk feature-A"

> > and then when committing your changes to svn just commit them as a
> > single snapshot (by copying the files from a bzr to a svn working
> > tree).
> Okay. I presume you mean something like:
> 
>     cd trunk-of-subversion/
>     rsync -a --delete-after --exclude '.bzr' ../feature-A/. .
>     make test
>     svn commit --message "Merged from feature-A/."
Yep, exactly.

> > Of course, pulling from Subversion inside of the feature branch
> > after doing that will probably result in spurious conflicts, because
> > Bazaar doesn't have a way to match up the revision pushe into
> > Subversion with the ones in your feature branch.
> Is this the problem you described earlier, where it wouldn't work
> maintaining a Bazaar repository inside the Subversion checkout?
No, this is different. It basically means that once you've done that  
 rsync + "svn commit" and you then run "bzr pull" in your feature-A  
 directory, you'll get a bunch of conflicts because bzr doesn't
  recognize that the new commit in trunk and the changes in that
 feature branch are actually the same changes.

Cheers,

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