Uwe Brauer <o...@mat.ucm.es> writes:

> Ok, one last question then. I have found the equivalent hg command for
> that procedure but before sending that patch I would like to check it
> with git on my local git clone of auctex.
>
> Here is what I have done so far.
>
> I generated my patch (I meant to one with various changesets)
>
> I clone again with git and with hg the latest auctex repo.

I guess there's a better way than to clone the repository again.  See
for example:

http://stackoverflow.com/questions/1725607/can-i-squash-commits-in-mercurial

> I apply my patch
>
> In hg: hg import mynewpatch.patch
>
> Hg log -G
>
> Shows my three changesets (so your complain is confirmed)
>
> In git
>
> git am --patch-format=hg mynewpatch.patch
>
> And git log --graph
>
> Tells me only one commit and one changeset.

Indeed, I just verified that using your older pretty2.patch.  Maybe it
only applies the first patch in the mail.  But on the other hand, that
patch contained a hunk that changed the same section the other patch in
the mail created.  So in theory that should have failed then.  So it
seems it applies all patches as one single commit and takes just the
message from the top-most patch.

I think that problem doesn't arise when using git because git
format-patch creates one mail per commit, never a mail with many
commits.

Bye,
Tassilo


_______________________________________________
auctex-devel mailing list
auctex-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/auctex-devel

Reply via email to