notes on applying a merge changeset

[John A Meinel]

Denys Duchier wrote:
> John A Meinel <john at arbash-meinel.com> writes:
> 
>>> There is currently code that attempts to preserve uncommited changes
>>> in metadata (the exec flag).  I think that all uncommited changes
>>> should be "preserved".  In other words: we should be merging into a
>>> "working tree", not merely into a pristine checkout of a committed
>>> revision.
>> Where are we *not* merging into the working tree?
> 
> you are not, when (at merge time) modifications in the working tree
> are considered illegal.

Are you saying that we are doing that now, or that we are going to be
doing that in the future?

> 
>> I think that merging into a modified tree should be severely
>> discouraged. It should be possible to do so with something like the
>> current 'merge --force'. But the library should be capable of detecting
>> that there are modifications before it starts trying to make any changes.
> 
> I suspect you failed to appreciate the point I was making about the
> distinction between UI and library API.  The UI should (probably by
> default) keep the user from making stupid mistakes.  The library API
> should empower the programmer (it should certainly not make things
> arbitrarily impossible).  It is fine with me if --force is required in
> the UI.  It is not fine with me if the library API makes it impossible
> to merge into a working tree with uncommitted changes.
> 
> Cheers,
> 
> --Denys
> 

Well, currently 'bzr revert' is implemented using the merge code. Which
means that it *has* to support uncommitted changes. Since at the least
in needs to be able to remove them. :)

I think I'm misunderstanding your point. To the best of my knowledge the
current code supports merging into modified working trees. Your comments
sound like it doesn't but it should.

John
=:->


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 249 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051228/64b09fb4/attachment.pgp