D5496: revset: add "samebranch" keyword argument to the merge revset

Didly didlybom at gmail.com
Sun Jan 20 11:14:53 UTC 2019


What about “selfmerge”?

El El jue, 17 ene 2019 a las 14:27, yuja (Yuya Nishihara) <
phabricator at mercurial-scm.org> escribió:

> yuja added a comment.
>
>
>   >   > Okay, I didn't notice that. And it's tricky to map
> `samebranch=False` to
>   >   >  "different branch" constraint. I would read it as "I don't care
> whether
>   >   >  the branches are the same or not."
>   >   >
>   >   > We can instead express it as `merge() - merge(samebranch=True)`.
>   >
>   >   Do you mean that the flag should only indicate whether you want to
> hide the same branch merges?
>
>   I just mean tri-state bool is confusing. `<whatever>=False` sounds like
> we
>   don't care about the `<whatever>` condition.
>
>   > I guess that is OK too, since the main use case for this flag is to
> hide the merge from the same branch. However I think we should change the
> flag name then. Perhaps "hidesame"? Or "includesame" or "includeself",
> defaulting to True? Any ideas?
>
>   It could be an argument taking a string like `'same'`, but I can't think
>   of nice names. What's the best term describing a merge between two named
>   branches?
>
> REPOSITORY
>   rHG Mercurial
>
> REVISION DETAIL
>   https://phab.mercurial-scm.org/D5496
>
> To: angel.ezquerra, #hg-reviewers
> Cc: yuja, mercurial-devel
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-devel/attachments/20190120/4b1032fa/attachment-0002.html>


More information about the Mercurial-devel mailing list