[PATCH 4 of 5 V3] update: specify custom conflict markers for update (BC)

[Durham Goode]

On 5/15/14, 2:18 PM, "Antoine Pitrou" <solipsis at pitrou.net> wrote:

>On Thu, 15 May 2014 21:05:53 +0000
>Durham Goode <durham at fb.com> wrote:
>> 
>> I don¹t think normal users have a great understanding of the difference
>> between the working copy and the repository.  Œdestination¹ at least
>> differentiates itself from working copy in that the working copy is your
>> files, and destination is where you¹re going, especially since this only
>> shows up during an hg update.
>
>I'm not sure how someone can use hg without understanding the
>difference between working copy and repository.
>On the other hand the word "destination" is confusing here. You claim
>that the "destination" is where you fetch the changes *from*, but my
>own intuition is that the "destination" of an update is the working
>copy, i.e. where you put the changes *into*.

I’ll let others chime in here.  I think of ‘hg update’ as you moving to
another spot in the repository, hence destination makes sense in my mind.


>
>Regards
>
>Antoine.
>
>
>PS : I don't know what you compose your e-mails with, but the charset
>declaration in your headers looks wrong here (see above quotation of
>your message as seen from here).

I tried changing my email settings to be UTF-8.  Let’s see how this one
turns out.