[I give up using the hg-git plugin for the moment] (was: hg-git plugin, fast forward a git repo.)

Uwe Brauer oub at mat.ucm.es
Wed Oct 9 14:14:10 UTC 2019


   > Uwe Brauer <oub at mat.ucm.es> writes:


   > It's hard to track exactly what you're doing and what you are trying to
   > do and what is happening.  It was be really helpful if you gave more
   > complete information when you asked questions, read the output entirely,
   > and asked pointed questions based on it.  In particular, the output of
   > any command you ran is clearly very valuable in helping diagnose what is
   > going on .

   > So as I said, if you start with your initial repository state, what
   > happens if you do:

   > hg up strings
   > hg book master

   > What is the output?
Of hg log -G?

@  changeset:   195:b2396f3ceca3
|  bookmark:    master
|  bookmark:    strings
|  tag:         default/strings
|  tag:         tip
|  user:        User 1
|  date:        Sun Oct 06 21:41:11 2019 -0400
|  summary:     Fix spurious character inseted.
|

   > Since you are doing hg-git stuff, I don't know if hg out works as
   > expected, but you likely need the -B parameter.  But early you sad you
   > did a push and nothing happened, and now you stated that you do not want
   > to do the push I suggested because you don't like to push without
   > knowing things, so did you try the push or did you not?

Sorry I never pushed I always run 
 hg out 

In order to make sure what would happened if I pushed.

   > The documentation says it compares bookmarks, and -B doesn't take a
   > bookmark.  You can tell because the parameter does not take a parameter
   > in the documentation.

Ok, I think I give up, I will treat this repository using git and merge
the two branches there. Makes me nervous that I don't really control
what I am doing and I need to merge and to push.

Thanks for your help

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


More information about the Mercurial mailing list