Configuring hg for svn-style diffs.
Augie Fackler
lists at durin42.com
Mon Jul 18 22:30:10 UTC 2011
On Jul 18, 2011, at 5:21 PM, Matt Mackall wrote:
> On Mon, 2011-07-18 at 16:53 -0500, Augie Fackler wrote:
>> On Jul 18, 2011, at 12:24 PM, Daniel Carrera wrote:
>>
>>> On 07/18/2011 07:22 PM, Augie Fackler wrote:
>>>> Note that diff --svn is added by hgsubversion, and isn't very
>>>> sophisticated (it just modifies git-format diff output to be svn-like
>>>> enough that reviewboard didn't choke on it as of 2 years ago when I
>>>> wrote the feature).
>>>
>>> Ok, thanks for letting me know. I think in my case it doesn't matter. AFAICT GCC developers use "patch", so as long as "patch" can understand it, it's alright. I just wanted to use a diff format that would be more familiar to the people reviewing the patches.
>>
>> In that case, standard 'hg diff' should be in a format patch(1) can
>> parse just fine. hg diff --git should also work.
>
> It looks like GNU's version of patch(1) recently gained support --git
> patches, but that support hasn't made it into a tagged release yet (the
> last release was in 2009). I don't think we can expect the average
> person's copy of patch(1) to support git-style patches for another five
> years.
I've never seen a git-diff that patch(1) *chokes* on, just extra data that it silentlly ignores. Do you have examples to the contrary?
>
> --
> Mathematics is the supreme nostalgia of our time.
>
>
More information about the Mercurial
mailing list