notes on applying a merge changeset

[John A Meinel]

Denys Duchier wrote:

...

> 
> 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?

> 
> I do not see why merging into a tree with uncommitted changes should
> be ruled out.  I understand that it may be desirable to warn the user
> about possibly unintended consequences, but I don't think that the UI
> should be dictating the library API.
> 
> Cheers,
> 
> --Denys

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.

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/0f708cbb/attachment.pgp