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

[Uwe Brauer]

> Don't commit the bug fix to your secret branch, commit it to default then merge it forward into your secret branch.

>    a. Shelve the other changes leaving fix in working directory.
>    b. Update to tip of default branch so fix can merge into default code.
>       * In TortoiseHg I have to 1st update to most recent descendant
>         from default branch before I can update to default's tip.
>    c. Commit fix to default
>    d. Merge committed change into secret branch.

And then it stays secret? That seems to be a cleaner solution, since I
find a merge easier to read in a graph than a graft (even with the --log
option).  Don't you think the graft operation should be somehow better
displayed in the graph (than via the --log option)?


I will try that out. It requires some ah discipline though
(aehm).

Thanks

BTW: do you notice some problems with the mailing list? I do.

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/20210916/84047a2b/attachment.p7s>