Re: An analysis of possible tree conflicts during update

On Wed, Dec 02, 2009 at 12:57:31PM +0000, Julian Foad wrote:
> > > 1. Locale add, incoming add

[...]

> > > - I was doing roughly the same thing but the item is a bit different.
> > > -> merge the two items -> manual 2-way merge (or 3-way if both are
> > > w/hist and it's the same copy-from source) -> MERGE.
> >
> > Yeah, we should provide a merge option in that case.
> > Much like what update does today for text conflicts, but with support
> > for installing the merged file on top of some other file in WORKING.
>
> "Installing the merged file on top of some other file in WORKING"?
> What/why?

Nevermind, flawed thinking.
I was thinking of a rename scenario. But this use case is dealing with
the add-half of a rename only, so we don't need to apply the edits
anywhere else.

Stefan
Received on 2009-12-02 14:20:42 CET