Resolving diverged branches in Subversion repository

[Jelmer Vernooij]

Am Mittwoch, den 18.06.2008, 00:46 +1000 schrieb Ben Finney:
> Ben Finney <bignose+hates-spam at benfinney.id.au> writes:
> 
> > I'll try the other option you present in the above FAQ: represent
> > the Subversion branch on my local system by using a Bazaar checkout
> > (instead of branch) of the Subversion branch.
> 
> Unfortunately this still causes lots of noise in the Subversion branch
> for every commit; see for example
> <URL:http://lists.alioth.debian.org/pipermail/reportbug-commits/2008-June/000001.html>
> which is the result of a merge into the Bazaar checkout of a
> Subversion branch.
> 
> How can we avoid this property-change noise in the Subversion
> repository when I use Bazaar on it?
See the relevant entry in the FAQ:
bzr-svn sets all kinds of file properties when pushing revisions into
Subversion. Is this really necessary?

Yes, this is because bzr-svn actually supports pushing to Subversion
retaining the exact same history that is in the Bazaar branch you're
pushing. These properties are used for storing Bazaar metadata that can
not be losslessly mapped to existing Subversion metadata.

It would be possible to support pushing changes to Subversion without
setting that metadata but then the revision created in Subversion would
actually be a different one than in your local branch. You would get a
DivergedBranches error when pulling from a svn branch you have just
pushed to.

We have considered setting revision properties with this metadata rather
than file properties so they don't show up in "svn diff" but that
requires more work in bzr-svn. Being able to set custom revision
properties also depends on Subversion 1.5 on the server or modification
of the default repository hooks.

If you are using trac, you can get it to ignore these file properties by
setting the "hide_properties" setting in the browser section of your
configuration to a list of properties that should not be displayed by
trac, e.g.:

[browser]
hide_properties = svk:merge, bzr:file-ids, bzr:merge, bzr:revision-info

I've talked with Russel Winder about adding a command similar to
git-svn's dcommit command, but that would mean you lose the ability to
treat the branch in Subversion as any regular bzr branch once you use
dcommit. 

Cheers,

Jelmer
-- 
Jelmer Vernooij <jelmer at samba.org> - http://samba.org/~jelmer/
Jabber: jelmer at jabber.fsfe.org
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 315 bytes
Desc: Dies ist ein digital signierter Nachrichtenteil
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080617/b2635900/attachment.pgp