Completed rename support

Giorgos Keramidas keramida at
Sun Dec 3 14:58:17 CST 2006

On 2006-12-03 11:51, Matt Mackall <mpm at> wrote:
>On Sun, Dec 03, 2006 at 08:46:34AM +0200, Giorgos Keramidas wrote:
>>On 2006-12-02 12:40, Matt Mackall <mpm at> wrote:
>>> The last piece of planned rename support, detection of
>>> directory renames at merge time, is now in tip. When either
>>> side of a merge moves all the files in a directory to another
>>> directory, files added to that directory on the other branch of
>>> the merge will also be moved.
>>> I'm planning to release 0.9.2 next Friday so testing here is
>>> appreciated.
>> Thanks!  When one of the heads modifies a file things seem to
>> work fine now :)
>> When one of the heads (either local or remote) removes a file
>> though, the user is prompted for *each* file with something like:
>> % remote changed a/a which local deleted
>> % (k)eep or (d)elete? k
>> or
>> %  local changed a/a which remote deleted
>> % (k)eep or (d)elete? k
> This behavior has been there since the beginning of time,
> are you seeing something new?

No, this is not new.

>> This is probably ok for a single file or two, but for dozens of
>> files it will be hard to keep answering all the prompts.  What
>> seems odd at this prompt is that there is no way to see *what*
>> the local or remote changed, so it's kind of hard to make a
>> really informed decision about keeping the changes or deleting
>> the file.
>> The only good-enough action at this point (at least for me) is
>> usually to abort the merge, "hg up -C" to a known head and diff
>> with the other head looking for stuff that would be interesting.
> You can open another window and hg diff -r -r. An option to show a
> diff here would be useful, agreed.

Agreed.  This is *exactly* why I mentioned it now :)

More information about the Mercurial-devel mailing list