[don't merge too early, use graft when needed]

Uwe Brauer oub at mat.ucm.es
Fri Sep 17 13:14:15 UTC 2021



> Yes. Changes merged into a secret branch will also be secret while the
> public\draft parent branch will stay as is. It's only when merging
> from a secret branch out to a non-secret branch that a secret branch
> can't be secret anymore.

> Oh, and you'll want to make sure your multiple local repos are not
> publishing so push\pulls between them don't change any of the
> revisions to public.
>    [phases]
>    publish = False

Right, but I try to avoid this. I find public changesets quite when pushing and pulling.

> TortoiseHg displays graft parents with a dashed line without me
> needing to do anything. 


@Dev team, which not having such a feature for the command line log command?


> You at least have several different points at which to catch it
> though. Sometimes it's not until I'm committing my changes that I
> realize "Wait, that's a bug fix that belongs in default". If I don't
> catch it until a while after committing to the wrong branch, then it's
> either graft or some history editing. (I'm not using evolve yet.)

I can only strongly recommend it, because

    1. You can use topics, which are very very useful as short live
       branches without the inconveniences of git branches or mercurial bookmarks!

    2. You can rename named branches as in 
       hg up 0 (or whatever change set)
       hg branch newname
       hg amend
       hg evolve

    3. You can use the collapse option for rebase in a better way, for
       example you use a named branch for a quick fix, but have some
       commits you switch back to the default branch and run 
       rebase -d . -b fixed-branch --collapse

regards

Uwe 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 5673 bytes
Desc: not available
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20210917/626f4d35/attachment.p7s>


More information about the Mercurial mailing list