Resolving diverged branches in Subversion repository

[Jelmer Vernooij]

Am Sonntag, den 22.06.2008, 17:54 +1000 schrieb Ben Finney:
> Jelmer Vernooij <jelmer at samba.org> writes:
> > Am Sonntag, den 22.06.2008, 14:12 +1000 schrieb Ben Finney: 
> > In other words, if you'd like to avoid these file properties being
> > set, don't use bzr-svn for now.
> 
> Okay. How, then, can I use the tools I have (Bazaar client, Subversion
> client) to continue working with the Bazaar branches made from the
> Subversion repository, without annoying the Subversion-using
> developers with file property noise?
> 
> Or, to repeat part of the pervious message:
> 
> 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 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). 

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.

Cheers,

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