how to find all merges into the default branch

Becker, Mischa J mischa.becker at kroger.com
Mon Feb 12 18:34:13 UTC 2024


I have no familiarity with hg-git repos but, just looking at your filter, you aren't including merges, just heads.

Would the following work?

merged = log -G -r "merge()+head()-parents(merge())-closed()-tag(tip)"

Mischa Becker

> -----Original Message-----
> From: Mercurial <mercurial-bounces at lists.mercurial-scm.org> On Behalf Of
> Uwe Brauer via Mercurial
> Sent: Saturday, February 10, 2024 8:20 AM
> To: Mercurial List <mercurial at mercurial-scm.org>
> Subject: how to find all merges into the default branch
>
> ** [EXTERNAL EMAIL]: Do not click links or open attachments unless you
> recognize the sender and know the content is safe. **
>
> Hi all
>
> I would like to find out the changesets in which merges occurred.
>
>
> I found
> https://urldefense.com/v3/__https://www.reddit.com/r/mercurial/comments/10z
> d5q/how_to_find_all_branches_that_has_been_merged_in/__;!!J-
> PWDud9Isc!mQ5kbWaM2QvSXF7KzLYkoKwaHO4HKDjNZl0Da5ZrDaGF6U7fwS65xgq7vlgLTM2Jd
> k618eMBhbWxjeTzfcT946TCaTupnzYt$
>
> Which might be a bit too old
>
> The repository in question is a git repository imported to mercurial via
> hg-git git://git.savannah.gnu.org/auctex.git
>
> So the merges are basically all on the default branch using bookmarks the
> start of the graph looks like
>
>
> ○  changeset:     8381:534071060884
> │  Branch:        default
> │  Author:        Ikumi Keita <ikumi at ikumi.que.jp>
> │  Date:          Sun, 21 Jan 2024 15:34:53 +0900
> │  Phase:         public
> │  Summary:       ; * doc/changes.texi: Reshape the new entries.
>> ○  changeset:     8380:c861cd81ffb7
> │╲   Branch:        default
> │ │  Author:        Ikumi Keita <ikumi at ikumi.que.jp>
> │ │  Date:          Sun, 21 Jan 2024 15:29:01 +0900
> │ │  Phase:         public
> │ │  Summary:       Merge branch 'feature/fix-mode-names-overlap'
> │ │
>
>
> So I tried
>
> merged = log -G -r "head()-parents(merge())-closed()-tag(tip)"
>
> merged = log -G -r "head()-parents(merge())-tag(tip)"
>
> But I see
>   changeset:   7489:3c292ae41384
> │  bookmark:    core-latex-in-style-hooks
> ╧  tag:         default/core-latex-in-style-hooks
>    user:        Tassilo Horn <tsdh at gnu.org>
>    date:        Tue Jun 16 22:02:02 2020 +0200
>    summary:     Run LaTeX-core style hook in latex2 and latex2e hook
>
> ○  changeset:   6696:2712881b091c
> │╲   bookmark:    simplify-TeX-parse-error
> ╧ ╧  tag:         default/simplify-TeX-parse-error
>      parent:      6686:1b8ed9c58e49
>      parent:      6695:80948ef561c8
>      user:        Tassilo Horn <tsdh at gnu.org>
>      date:        Sun Jan 31 08:17:25 2016 +0100
>      summary:     Merge branch 'master' into simplify-TeX-parse-error
>
> But not the merge I just described.
>
> Any idea what to do?
>
> Thanks
>
> Uwe Brauer
>
> --
> I strongly condemn Hamas heinous despicable pogroms/atrocities on Israel I
> strongly condemn Putin's war of aggression against Ukraine.
> I support to deliver weapons to Ukraine's military.
> I support the EU and NATO membership of Ukraine.
>
> _______________________________________________
> Mercurial mailing list
> Mercurial at lists.mercurial-scm.org
> https://urldefense.com/v3/__https://lists.mercurial-
> scm.org/mailman/listinfo/mercurial__;!!J-
> PWDud9Isc!mQ5kbWaM2QvSXF7KzLYkoKwaHO4HKDjNZl0Da5ZrDaGF6U7fwS65xgq7vlgLTM2Jd
> k618eMBhbWxjeTzfcT946TCaW5aOQlA$

________________________________

This e-mail message, including any attachments, is for the sole use of the intended recipient(s) and may contain information that is confidential and protected by law from unauthorized disclosure. Any unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended recipient, please contact the sender by reply e-mail and destroy all copies of the original message.


More information about the Mercurial mailing list