automatically switched to topic confusion

Sushil Khanchi sushilkhanchi97 at gmail.com
Mon Feb 1 04:33:17 UTC 2021


Yeah, so --clear flag did its work.
And after you did `pull -u` it updated the working directory parent to the
head of descendants,
as -u flag description says "update to new branch head if new descendants
were pulled".

To know what exactly happened and the reason for the new topic with a
similar name, try running
`hg obslog -r 'topic(ctuffli-doc-2)'`
Summary: that is a new descendant with a similar topic name created by a
different user.

On Mon, Feb 1, 2021 at 12:29 AM Chuck Tuffli <ctuffli at gmail.com> wrote:

> This is my first real interaction with Heptapod and I'm a little
> confused as to what happened. Thanks in advance for bearing with a
> n00bie.
>
> I had been working on a documentation update (topic ctuffli-doc) which
> was merged upstream (thanks!). Today I wanted to work on a new set of
> updates and somehow ended up on a new topic:
>
> $  hg version | head -1
> Mercurial Distributed SCM (version 5.6.1)
> $ pip3 list | grep evolve
> hg-evolve                     10.1.0
> $ hg topics --current
> ctuffli-doc
> $ hg topics --clear
> $ hg topics --current
> no active topic
> $ hg branch
> stable
> $ hg pull --up
> pulling from ssh://hg@foss.heptapod.net/mercurial/evolve
> remote: X11 forwarding request failed on channel 0
> searching for changes
> adding changesets
> adding manifests
> adding file changes
> added 83 changesets with 341 changes to 99 files (+9 heads)
> 380 new obsolescence markers
> obsoleted 15 changesets
> 1 new orphan changesets
> new changesets b56d07c41044:ceb1dfe19071 (49 drafts)
> switching to topic ctuffli-doc-2
> 85 files updated, 0 files merged, 0 files removed, 0 files unresolved
> $ hg stack
> ### topic: ctuffli-doc-2
> ### target: stable (branch), 2 behind
> s1@ doc: move introduction to separate file (current)
> s0^ doc: update MQ To Evolve refugee book (base)
>
> The intent was to abandon the topic, thus the --clear. Should I have
> done an `hg up stable` even though it was already on the stable
> branch?
>
> Also, how did I end up on a new topic with a similar name?


> --chuck
> _______________________________________________
> Mercurial mailing list
> Mercurial at mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20210201/fb1f2e48/attachment-0002.html>


More information about the Mercurial mailing list