'hg prune --pair -s' updates to "strange" rev
Josef 'Jeff' Sipek
jeffpc at josefsipek.net
Wed May 15 18:09:53 UTC 2019
On Wed, May 15, 2019 at 18:53:01 +0200, Pierre-Yves David wrote:
> On 5/15/19 4:56 PM, Josef 'Jeff' Sipek wrote:
> > I have a repo I use hg-git and evolve (30a544904) on. Today, one of the
> > other team members rebased my work-in-progress commits against the latest
> > master - in the git repo. After the usual pull+phase+pull+prune dance, I
> > ended up with the right DAG *shape* but the wdir and bookmark ended up in a
> > "strange" place.
> >
> > While writing up this email, I have concluded that the prune command doesn't
> > do any special handling of wdir and bookmarks when invoked with -s.
>
> If in remember correctly, it should. (but the code is old, so memory can
> be faultly)
>
> > I'd argue that if one runs 'hg prune -s' and the wdir is in the pruned
> > revset or there are any bookmarks in the pruned revset, then prune should
> > move them to the corresponding successor. As I found out earlier today, it
> > seems to move them to the first non-pruned ancestor. (Which is a fine
> > behavior when -s is *not* specified.)
> >
> > Am I missing something? Am I misusing 'hg prune -s'?
>
> The logic might be confused. Do you have a simple test case we could
> look at ?
I don't. I'll try to come up with one.
...
> > I would expect the wdir and feature-branch bookmark to move to the
> > corresponding successor (a459b186772a aka B'), not to the first non-pruned
> > ancestor (c5b05fa5cff4).
>
> Your expectation are find. This looks like a bug. Can you report it on
> bz.mercurial-scm.org (ideally with a repro).
Will do. It may take me a day or two to get around to it.
Jeff.
--
It used to be said [...] that AIX looks like one space alien discovered
Unix, and described it to another different space alien who then implemented
AIX. But their universal translators were broken and they'd had to gesture a
lot.
- Paul Tomblin
More information about the Evolve-testers
mailing list