Re: Update that pulls a null delta

Alan Barrett wrote on Sat, Oct 13, 2012 at 15:16:00 +0200:
> On Fri, 12 Oct 2012, Daniel Shahaf wrote:
>> If an update pulls in a null delta --- eg, because it updates across two
>> revisions that revert each other --- then it should behave as though it
>> pulled nothing at all: output no 'U filename' lines, and print "At
>> revision %ld".
>>
>> Right?
>
> As a user, I want to see the 'U filename' report.
>

Perhaps ' filename' would be more accurate? That way the output is
still clear that "Nothing happened".

> However, if updating to an intermediate revision would have produced
> conflicts, then updating to the final revision (which undoes the
> changes) should not produce conflicts.
>
> --apb (Alan Barrett)
Received on 2012-10-13 17:03:32 CEST