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 On Behalf Of
> Uwe
From: Uwe Brauer
Sent: Wednesday, October 25, 2023 12:16 AM
Subject: [more experimients] (was: single-file-merge?)
>
> > I'm pretty sure all those file changes you threw away in the merge
> > from meta to default will get stripped from meta if you later merge
> > default back into meta.
>
>
> I
> From: Uwe Brauer
> Sent: Tuesday, October 24, 2023 5:54 AM
> To: Mercurial List
> Subject: single-file-merge?
>
> ** [EXTERNAL EMAIL]: Do not click links or open attachments unless you
> recognize the sender and know the content is safe. **
>
> Hi all
>
> I have two branches
>
> 1. default
> -Original Message-
> From: Uwe Brauer
> Sent: Friday, July 21, 2023 8:25 AM
>
> What is a bit confusing, is:
>
> 1. Merging is allowed in both cases. If I had used bookmarks (or
>even topics, at least in the standard setting) then hg would have
>refused the merge,
Even if you create a 2nd head as Rainer suggested, you still have the problem
that the backout, rev 7, happens later in the tree than rev 6 so future merges
will continue to backout the rev 6 changes. Backing out rev 7 while on rev 9
essentially merges in your changes from rev 6. If you don't
