[MERGE/RFC] MemoryTree and a TreeBuilder helper

[John Arbash Meinel]

Aaron Bentley wrote:
> John Arbash Meinel wrote:
>>> As far as the discussion, I actually think there should be some explicit
>>> action to cause a entry to change kind. Because the user actually did
>>> *something*. Whether they deleted a file and created a directory, or
>>> moved the file out of the way, created a directory, and renamed the file
>>> foo/__init__.py.
> 
> Another case: they may have resolved a contents conflict in favor of a
> directory.
> 
> For branch A, say there is a regular file, 'foo'.
> Branch A is branched, creating branch B.
> In branch B, 'foo' is changed into a directory, and committed.
> In branch A, the contents of 'foo' are changed, and committed.
> B merges A, producing a conflict, with foo.OTHER as a versioned regular
> file, foo.THIS as an unversioned directory, and foo.BASE as an
> unversioned regular file.  (There is no foo, because this is not a text
> conflict.)
> The user does 'bzr mv foo.OTHER foo', 'mv foo.THIS foo', 'bzr resolve
> foo', 'bzr commit'.
> Should they have to provide more confirmation that they want to change
> the type of foo?

Isn't the act of doing 'bzr resolve' sufficient to mark it okay? Though
this depends on how we trap it.
I was thinking more of a 'bzr update-kinds' step, which marks kind
changes as approved, and no flag to 'bzr commit'.

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/20060912/abd45add/attachment.pgp