A few thoughts on foreign integration...

[Jelmer Vernooij]

On Tue, 2010-10-19 at 14:51 +1300, jbowtie at amathaine.com wrote:
> On Tue, Oct 19, 2010 at 1:34 PM, Jelmer Vernooij <jelmer at samba.org> wrote:
> >
> > So, this is a problem that we've encountered in some other situations as
> > well (the "parallel imports" problem overlap with this one, for
> > example). Various solutions have been proposed, but they either haven't
> > been worked out in detail (e.g. path tokens) or have other issues (file
> > id aliases).
> Wouldn't setting a bzr:file-id property on file-add prevent this
> particular scenario? That seems like the obvious strategy, and I'm
> curious as to why it wouldn't be a good solution. I was planning on
> doing the equivalent in bzr-tfs specifically to handle this issue.
Do you mean a file property or a revision property ? 

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. 

Cheers,

Jelmer
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20101019/7f4685dc/attachment.pgp