Non recursive update with subrepo's

[Angel Ezquerra]

On Thu, Jan 30, 2014 at 5:02 PM, Kastner Masilko, Friedrich
<kastner-masilko at at.festo.com> wrote:
>> From: Raphael Sebbe [mailto:raphael.sebbe at gmail.com]
>>
>> I will double-check that, it's possible. I use it mostly through a UI
>> (SourceTree), so I need to verify that.
>
> Well, a proper GUI should take this into account, too. TortoiseHg does it by means of presenting a prompt with the options to merge, shelve, or discard changes if it detects dirty working-copies. If "merge" is used, it simply lets Mercurial do its magic on the working-copy merge.
>
> Of course there is always the possibility for a non-standard configuration. You could e.g. set a default to always use -C on update. Perhaps your UI did such nonsense on installation?
>
> Regards,
> Fritz

Also note that recent mercurial versions will detect subrepo
divergences during a merge. In the past these would lead to a merge on
the subrepo, but now you get a prompt where you have 3 options: keep
the subrepo version in parent 1, keep the subrepo version in parent 2
or merge them (the latter is what older mercurial versions would do
automatically).

Cheers,

Angel