how to ammend a changeset and push

Uwe Brauer oub at mat.ucm.es
Fri Oct 18 13:28:43 UTC 2024


Thanks!


   > I do these kind of modifications very often with hg-git and evolve. I
   > doubt that the changeset is really public because there is no such
   > concept in the git world. 
Well you have the setting:
[hggit]
usephases = False
 
Or 
usephases = True.

In the first case, cloning a repository will result that all changesets
are in draft mode, while with setting it to True, these changesets will
all be public.


   > If it is marked as public in your local repo
   > this should be due to a bad configuration. If the maintainer asked you
   > to amend the commit, it should not yet be in a protected branches so
   > you should be able to force push (-f).

Here are my steps.

    1. I am using the latest changeset in hg-git 2312779a6485

    2. I have set 
       [hggit]
       usephases = False

    3. I run hg clone git at github.com:ouboub/melpa-matlab.git

    4. cd melpa-matlab

    5. hg up matlab (a bookmark)

    6. edit

    7. hg amend

    8. hg push results in
       pushing to git at github.com:ouboub/melpa-matlab.git
       Warning: Permanently added 'github.com' (ED25519) to the list of known hosts.
       searching for changes
       abort: pushing refs/heads/matlab overwrites d3c2f4a60df9

    9. Options:

       a. hg push -f (that works but looks harmful to me)

       b. Hg push -B matlab (that did not help)


How do you do this?


-- 
I strongly condemn Hamas heinous despicable pogroms/atrocities on Israel
I strongly condemn Putin's war of aggression against Ukraine.
I support to deliver weapons to Ukraine's military. 
I support the EU and NATO membership of Ukraine. 

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


More information about the Mercurial mailing list