[PATCH 2 of 9] topic: take topic in account for all branch head computation

Augie Fackler raf at durin42.com
Mon Mar 14 10:07:55 EDT 2016


(+list for posterity)

On Mon, Mar 14, 2016 at 01:26:10AM +0000, Pierre-Yves David wrote:
> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david at fb.com>
> # Date 1457796977 0
> #      Sat Mar 12 15:36:17 2016 +0000
> # Node ID 76d8f7bed964feac89ac4227aca8cb358937d3b2
> # Parent  c44f161575ba5a2618e0c2797db1e78012d38fbf
> # EXP-Topic topicmap
> topic: take topic in account for all branch head computation

[...]


> @@ -379,11 +384,11 @@ We can pull in the draft-phase change an
>    searching for changes
>    adding changesets
>    adding manifests
>    adding file changes
>    added 1 changesets with 1 changes to 1 files (+1 heads)
> -  (run 'hg heads' to see heads, 'hg merge' to merge)
> +  (run 'hg heads' to see heads)

Seems like a slight bummer to have this change. I don't know that it's
important for now, but something to consider usability-wise.

>    $ hg topics
>       fran
>     * query
>    $ hg log -Gr 'draft()'
>    o  changeset:   9:0469d521db49
> @@ -511,10 +516,11 @@ Deactivate the topic.
>    $ hg topics
>     * fran
>    $ hg topics --clear
>    $ echo fran? >> beta
>    $ hg ci -m 'fran?'
> +  created new head
>    $ hg log -Gr 'draft()'
>    @  changeset:   10:4073470c35e1
>    |  tag:         tip
>    |  user:        test
>    |  date:        Thu Jan 01 00:00:00 1970 +0000


More information about the Mercurial-devel mailing list