[don't merge too early, use graft when needed] (was: Mercurial Digest, Vol 197, Issue 4)

Uwe Brauer oub at mat.ucm.es
Sun Sep 12 07:00:01 UTC 2021


>>> "AB" == Arne Babenhauserheide <arne_bab at web.de> writes:

> Uwe Brauer <oub at mat.ucm.es> writes:
> It is a great match for secret changesets: Just add `hg phase -s .`
> after hg branch and you have a branch that you cannot push accidentally.
> Now you keep working there and before pushing you can adjust the name as
> needed.


I found out a small inconvenience of this approach.

    1. I work on my secret branch, but find a fix. So I

       a. Running hg ci -i  I only commit this fix

       b. I shelve the other changes.

       c. I merge that change set into default.

    2. Now that change set is secret and I need to change it to draft.
       This it was a merge all of my change sets in my secret branch
       also turn into draft.

    3. When I use graft, this problem does not occur, however as I said
       in my earlier email there (almost) no indication in the graph of
       a graft operation (I use the --log option and then I can see that
       message). Anyhow it might be good enough.

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/20210912/b5434d85/attachment.p7s>


More information about the Mercurial mailing list