A few thoughts on foreign integration...

jbowtie at amathaine.com jbowtie at amathaine.com
Tue Oct 19 22:19:39 BST 2010


On Tue, Oct 19, 2010 at 10:55 PM, Jelmer Vernooij <jelmer at samba.org> wrote:
>
> Newer versions of bzr-svn only set Subversion revision properties for a
> couple of reasons:
>
>  * file properties show up in most diffs, and svn will show the contents
> of the entire property this when it diffs them
>  * file copies by svn users will preserve the bzr:file-id property,
> which needs to be unique. So we would have to do analysis to figure out
> which properties are actually valid.
>  * finding out the file ids that are present in a particular tree has
> the same cost as fetching the tree itself
>  * merging two branches to which pushes have been done by bzr-svn causes
> lots of weird conflicts when merged with "svn merge"
>
> So we use revision properties. Unfortunately they don't get propagated
> by "svn merge". We could look through the history when svn:merge-info is
> set, but I don't think this is worth the (significant) performance hit.
>

OK, that clarifies things for me. I don't face the file-copy issue
with bzr-tfs since they also use file-ids to track renames. I might
have to consider some of those other issues though.



More information about the bazaar mailing list