Alternative to sourcehut

Manuel Jacob me at manueljacob.de
Mon Aug 26 11:06:25 UTC 2019


On 2019-08-26 09:26, Uwe Brauer wrote:
>    > If you scroll up in the link, you see that it’s the second patch 
> in a
>    > patch series of two.  Probably you need to apply both patches to 
> avoid
>    > merge conflicts (the first one is also useful to catch the error 
> that
>    > the same ref was added for different changesets). Originally these
>    > patches have been developed on top of
>    > 2135ddef6d6e93afd8998ca824efd4680d4f1830, but they should apply 
> also
>    > to the tip of https://bitbucket.org/durin42/hg-git .
> 
> Thanks,
> I cloned https://bitbucket.org/durin42/hg-git
> 
> but
> I cannot apply your patch using hg import patch1.patch etc
> 
>     1. When I try it and have the evolve extension activated, I obtain 
> a
>        a series of errors, which I will send to the evolve mailing 
> list.
> 
>     2. When I disable evolve and any other extensions of the matter I
>        obtain
> 
> applying /home/oub/ALLES/src/patch1.patch
> patching file hggit/git_handler.py
> Hunk #1 FAILED at 1374
> 1 out of 1 hunks FAILED -- saving rejects to file 
> hggit/git_handler.py.rej
> abort: bad hunk #1 @@ -0,0 +1,26 @@
>  (1 0 26 26)
> 
> I also run
> 
>  hg up 2135ddef6d6e
> 
> And run the import command again, same result.
> 
> Something is odd here.

The patch seems to be corrupted when copying it to your local machine.  
It it possible to show the raw message with "Nur Nachricht anzeigen".  
Unfortunately, the patch can’t just be saved and applyed, because it’s 
presented with DOS file endings.  They must be removed before applying 
the patch.

Automatizing the task (this worked for me):

hg import <(curl 
'https://groups.google.com/forum/message/raw?msg=hg-git/U6RN9unOUBk/kX4ivgmhBQAJ' 
| tr -d '\015')
hg import <(curl 
'https://groups.google.com/forum/message/raw?msg=hg-git/U6RN9unOUBk/O01l_AmhBQAJ' 
| tr -d '\015')



More information about the Mercurial mailing list