Alternative to sourcehut
Uwe Brauer
oub at mat.ucm.es
Mon Aug 26 07:26:32 UTC 2019
> The patch makes it possible to automatically add a Git ref. If
> configured correctly, you can save the work of adding the bookmark /
> ref yourself.
> If you add this to the repository’s hgrc,
> [git]
> export-additional-refs.named-branch-heads:revset = head()
> export-additional-refs.named-branch-heads:template =
> refs/heads/hg_named_branch/{branch}
> it will, for the head of each Mercurial branch with the name "BRANCH",
> create a Git ref "refs/heads/hg_named_branch/BRANCH", or in other
> words a Git branch with the name "hg_named_branch/BRANCH".
> When you pull again from the Git repository, you will see additional
> bookmarks. This is maybe a bit annoying, but the functionality was
> originally designed for unidirectional Mercurial -> Git syncing.
> 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.
Uwe
More information about the Mercurial
mailing list