[PATCH 4 of 4 V2] subrepo: show detailed revision info for the divergent subrepo revisions

Angel Ezquerra angel.ezquerra at gmail.com
Thu May 15 03:11:35 CDT 2014


On Thu, May 15, 2014 at 10:09 AM, Pierre-Yves David
<pierre-yves.david at ens-lyon.org> wrote:
>
>
> On 05/15/2014 12:53 AM, Angel Ezquerra wrote:
>>>>
>>>> diff --git a/mercurial/subrepo.py b/mercurial/subrepo.py
>>>> >>--- a/mercurial/subrepo.py
>>>> >>+++ b/mercurial/subrepo.py
>>>> >>@@ -209,9 +209,15 @@
>>>> >>                   option = repo.ui.promptchoice(
>>>> >>                       _(' subrepository %s diverged (local revision:
>>>> >> %s, '
>>>> >>                         'remote revision: %s)\n'
>>>> >>+                      'subrepository %s local revision
>>>> >> details:\n%s\n\n'
>>>> >>+                      'subrepository %s remote revision
>>>> >> details:\n%s\n\n'
>>>
>>> >
>>> >
>>> >Notes: This is about to "conflict" with Durham changes on labels.
>>> >(not landed yet)
>>
>> Is there anything I must do about this?
>
>
> Once the durham series will make it into core we can think of putting the
> local/remote terminologie of subrepo with the other name used in core.
>
> I recommend not touching anything for now as it is going to conflict with
> Durham series.

OK.

BTW I believe that the "local/remote" terminology in the subrepo
messages is really odd and confusing. IMHO there is nothing "remote"
about the subrepo revision on the other parent in a merge. IMHO it
would be best to change those to say either parent 1 and parent 2 or
to say local/other.

Cheers,

Angel


More information about the Mercurial-devel mailing list