Resolving diverged branches in Subversion repository

[Jelmer Vernooij]

Am Sonntag, den 22.06.2008, 08:27 +1000 schrieb Ben Finney:
> Jelmer Vernooij <jelmer at samba.org> writes:
> 
> > Am Freitag, den 20.06.2008, 19:49 +1000 schrieb Ben Finney: 
> > > So, what are my options here?
> 
> > If the properties really are a problem for you, you can wait for
> > either the dpush branch to be finished or until the new mappings
> > that use revision properties rather than file properties are done.
> I look forward to these changes, then. Is there a plan for which
> version they might appear?
the revision property use is some time away (0.5), not sure when that'll
appear.

dpush will probably make it into 0.4.12.

> > > For example, I already have a bunch of local Bazaar branches from
> > > a Subversion repository. Is it possible for me to continue merging
> > > changes from my local Bazaar branches back in somehow, preserving
> > > history (i.e. no "rebase") and avoiding needless property-change
> > > noise in the central Subversion repository?
> 
> > There's no way to avoid rebase if you're not storing metadata about
> > the revisions in Subversion somehow, since you need to use the same
> > file ids in the remote and the local branch. git-svn does it like
> > this as well and rebases the local branch each time you dcommit.
> > 
> > We *could* store that data locally in your home directory somewhere,
> > but that would mean you would only be able to push from your own
> > machine and your bzr branch would become useless to other people
> > (since they wouldn't be able to see the shared ancestry of your
> > branch and the branch in svn).
> The use case here already has me merging from Bazaar branches into a
> local Bazaar checkout of the Subversion repository. (This was done to
> avoid file-property changes on *every* file in the repository. Now it
> seems we "only" have file-property changes on files that are
> meaningless to Subversion users.)
> 
> Couldn't that be exploited somehow, to avoid file-property changes
> altogether in the Subversion repository?
Sorry, I'm not quite following what you mean here. 

Cheers,

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