Resolving diverged branches in Subversion repository

[Jelmer Vernooij]

Am Freitag, den 20.06.2008, 19:49 +1000 schrieb Ben Finney: 
> Ben Finney <bignose+hates-spam at benfinney.id.au> writes:
> 
> > Russel Winder <russel.winder at concertant.com> writes:
> > 
> > > The time taken to sort out the metadata really is quite significant.
> > > And then there are the commit reports with 30K of data about stuff
> > > that is completely irrelevant for people in mode 2.
> > 
> > Yes, this is causing a lot of friction for me working with other
> > hackers on Subversion repositories. From their perspective, Bazaar is
> > causing all this noise for no benefit.
> 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. 

> 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).

Cheers,

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