[PATCH 5 of 5 v2] namespaces: add other/local merge markers [RFC]
Pierre-Yves David
pierre-yves.david at ens-lyon.org
Fri Apr 1 00:28:50 UTC 2016
On 03/22/2016 08:24 PM, timeless wrote:
> # HG changeset patch
> # User timeless <timeless at mozdev.org>
> # Date 1458226294 0
> # Thu Mar 17 14:51:34 2016 +0000
> # Node ID 78f3810d5c9b9421885fd077a65831f65c80e9ef
> # Parent f8b55256f2bf7613df37760b87052cb79c036834
> namespaces: add other/local merge markers [RFC]
>
> Adds other/local markers to parents, and log commands
What about the label here. Simon have this series where both local/other
and the action specific label is used.
eg for rebase: local [destination]
This would make this like even more useful. This should probably be part
of another changesets
The "merging: X" phrasing feels a bit strange to me as it may give the
impression that "X is being merged into that changeset". But I like the
"ing" that implies that the action is in progress. I would say
"merging-as" but you seemed concern about the lenght and the "-". I
would be happy to find something better but the "merging:" proposal is
probably acceptable as is.
--
Pierre-Yves David
More information about the Mercurial-devel
mailing list