Is there an extension with a revset for 'all ancestors along the p1 line'?
Sietse Brouwer
sbbrouwer at gmail.com
Sun Jun 5 23:14:05 UTC 2016
Hi Scott,
On 05/06/2016, Scott Palmer <swpalmer at gmail.com> wrote:
> So you want to find changesets in master even those that may have been
> merged into my_feature. So you want the changes that are in master minus the
> changesets that are exclusively in my_feature?
The reverse, actually: I want to see every commit that I made with as
part of bookmark my_feature, and no other commits. (Assume I didn't
move the bookmark around, but just made each my_feature commit on top
of the previous one.) If I merged anything into my_feature, I want to
see the merge commit, but not its ancestors on the incoming side. So
If I do this:
hg up my_feature # rev 7
hg merge -r 8
hg commit # rev 9
Then I want to see commits 7 and 9, as I made those as part of
my_feature; but I don't want to see 8. The revset would have to work
for quite a few cases (my_feature was or was not merged into master;
master was or was not merged into my_feature; other branches merged
into master that are not descendants of my_feature; combinations of
the above).
The _firstancestors() revset lets me do exactly what I'm looking for
in all these cases; see my post that accidentally ended up in a
separate thread.
https://www.mercurial-scm.org/pipermail/mercurial/2016-June/049616.html
Thanks a lot for your time and attention, I really appreciate it that
you tried to find revsets that fit my needs.
Best wishes,
Sietse
More information about the Mercurial
mailing list