Resolving diverged branches in Subversion repository

[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?

> 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/."

> 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?

-- 
 \        "To be yourself in a world that is constantly trying to make |
  `\     you something else is the greatest accomplishment."  -- Ralph |
_o__)                                                    Waldo Emerson |
Ben Finney