Resolving diverged branches in Subversion repository

[Ben Finney]

Jelmer Vernooij <jelmer at samba.org> writes:

> Am Sonntag, den 22.06.2008, 14:12 +1000 schrieb Ben Finney:
> > How can I avoid this with the tools I have?

> Until either dpush ("push+rebase") or the revision properties branch
> are merged, there's no way to avoid file properties being set when
> using bzr-svn.
> 
> Alternatively, you can change your commit notification script to
> hide these properties (like a lot of people also do for svk file
> properties).

I don't know what this would involve, as I have no direct knowledge of
how the Subversion repository is managed. (I'm including one of the
Subversion-using developers in case he has some input on this point.)

Far preferable would be a solution I can implement myself, while still
working with the branches containing my work.

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

-- 
 \         “The userbase for strong cryptography declines by half with |
  `\      every additional keystroke or mouseclick required to make it |
_o__)                                             work.” —Carl Ellison |
Ben Finney