Are svn properties in bzr-svn important?
jelmer at samba.org
Thu Jul 12 15:03:25 BST 2007
On Thu, 2007-07-12 at 09:37 -0400, Aaron Bentley wrote:
> Jelmer Vernooij wrote:
> > What are the properties used for?
> > They're used for merge tracking. The ancestry information for the remote
> > branch will become incomplete (get_ancestry()). My guess is that this
> > has consequences for the quality of merge, but perhaps others can
> > comment on that better.
> Yes, this would reduce the number of merge candidates, causing merge to
> fail, or to produce poorer results. (Such as silently resolving
> conflicts in favour of someone else's changes.)
> But the corresponding attributes in Bazaar are not nearly this verbose.
> Why do we need such long properties for this? Can't we just list the
> parents of this revision, and derive the rest? In fact, we shouldn't
> usually need to list the lefthand parent, either.
It makes get_ancestry() really fast while keeping the contents of the
property sane. I can't set the contents of this property for one
specific revision, I can only set it as part of a change.
In the current scheme, bzr:merge contains anything that's ever been
merged. When looking for the merged revisions, I look for changes to
If I would keep this property limited to one line, that would have the
* get_ancestry() would significantly slower. This should be acceptable
* Looking at bzr:merge for a revision X will contain one line Y and
suggest that Y was merged in X, whereas it was perhaps actually merged
I could use Subversion revision properties for bzr:merge, but they can
be configured to be modifiable afterwards and need to be enabled in the
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Size: 307 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070712/52cd954c/attachment-0001.pgp
More information about the bazaar