[BUG] selected-file commit of merges is not supported yet

[John Arbash Meinel]

Jean-François Veillette wrote:
> 14:05:06: bzr commit Tamia2.xcodeproj -m "Caprices XCode"
> bzr: ERROR: exceptions.NotImplementedError: ('selected-file commit of
> merges is not supported yet: files %r', [u'Tamia2.xcodeproj'])
> 

Well, this shouldn't be generating such an awful looking traceback, but
the message is correct. We don't allow you to commit part of a merge.
Because then some files would have an ancestry graph that couldn't be
described by the global ancestry graph.

Along with the other discussions recently, I wonder if we could change
ancestry to be broken into smaller chunks. We have a per-file graph, we
could conceivably do a per-directory graph, which would somehow include
all of the files underneath it. And then as you recurse upwards you end
up with a whole-tree graph.

The trick is defining how the ancestry graph of the container reflects
the contents underneath.

Is there an arc in the top-level graph for any arc underneath it? This
probably ends up with too many arcs. Is there no arc in the parent until
all child arcs exist? But most of the children wouldn't be modified by a
given arc... So you would probably have to define it as an arc in the
parent when all modified children have arcs. And while that would be
valid, I'm not sure if it is *useful*.

John
=:->

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 254 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20061026/07d3d071/attachment.pgp