Patch format

classic Classic list List threaded Threaded
6 messages Options
Reply | Threaded
Open this post in threaded view
|

Patch format

Benson Margulies
I'm using the git mirror when making patches. Has anyone worked out a
good way to get patches in the usual highly digestible subversion
format when operating in this mode?

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: Patch format

Robert Muir
If its a patch from git/hg/etc, I just apply with patch -p1...
(ignoring the a/, b/ stuff)... are there any other traps? I've never
had any issue with that.

On Wed, Apr 11, 2012 at 2:14 PM, Benson Margulies <[hidden email]> wrote:
> I'm using the git mirror when making patches. Has anyone worked out a
> good way to get patches in the usual highly digestible subversion
> format when operating in this mode?
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: [hidden email]
> For additional commands, e-mail: [hidden email]
>



--
lucidimagination.com

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: Patch format

Dawid Weiss
In reply to this post by Benson Margulies
What do you mean? To prepare a patch? What I typically do is create a
local branch and then diff against trunk.

git checkout feature-branch
git diff --no-prefix trunk > XXX.patch

You can leave out --no-prefix -- this will create a patch which you
need to apply with patch -p1 < patch but otherwise it's the same
format.

Git supports binary patches, but svn doesn't (as far as I know). I
don't know how to handle binary patches that would be svn compatible.

Dawid

On Wed, Apr 11, 2012 at 8:14 PM, Benson Margulies <[hidden email]> wrote:
> I'm using the git mirror when making patches. Has anyone worked out a
> good way to get patches in the usual highly digestible subversion
> format when operating in this mode?
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: [hidden email]
> For additional commands, e-mail: [hidden email]
>

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: Patch format

Benson Margulies
In reply to this post by Robert Muir
On Wed, Apr 11, 2012 at 2:19 PM, Robert Muir <[hidden email]> wrote:
> If its a patch from git/hg/etc, I just apply with patch -p1...
> (ignoring the a/, b/ stuff)... are there any other traps? I've never
> had any issue with that.

Dunno. Perhaps Jan Høydahl would care to elaborate, as he is the
person who suggested sticking to 'svn diff'?


>
> On Wed, Apr 11, 2012 at 2:14 PM, Benson Margulies <[hidden email]> wrote:
>> I'm using the git mirror when making patches. Has anyone worked out a
>> good way to get patches in the usual highly digestible subversion
>> format when operating in this mode?
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: [hidden email]
>> For additional commands, e-mail: [hidden email]
>>
>
>
>
> --
> lucidimagination.com
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: [hidden email]
> For additional commands, e-mail: [hidden email]
>

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: Patch format

Dawid Weiss
I don't think there are any differences other than:

1) prefix added by git which can be stripped with -p1,
2) binary patches incompatibility (doesn't seem to be of much
importance since we don't have jars anymore and binary test files can
be added separately).

Dawid

On Wed, Apr 11, 2012 at 8:21 PM, Benson Margulies <[hidden email]> wrote:

> On Wed, Apr 11, 2012 at 2:19 PM, Robert Muir <[hidden email]> wrote:
>> If its a patch from git/hg/etc, I just apply with patch -p1...
>> (ignoring the a/, b/ stuff)... are there any other traps? I've never
>> had any issue with that.
>
> Dunno. Perhaps Jan Høydahl would care to elaborate, as he is the
> person who suggested sticking to 'svn diff'?
>
>
>>
>> On Wed, Apr 11, 2012 at 2:14 PM, Benson Margulies <[hidden email]> wrote:
>>> I'm using the git mirror when making patches. Has anyone worked out a
>>> good way to get patches in the usual highly digestible subversion
>>> format when operating in this mode?
>>>
>>> ---------------------------------------------------------------------
>>> To unsubscribe, e-mail: [hidden email]
>>> For additional commands, e-mail: [hidden email]
>>>
>>
>>
>>
>> --
>> lucidimagination.com
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: [hidden email]
>> For additional commands, e-mail: [hidden email]
>>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: [hidden email]
> For additional commands, e-mail: [hidden email]
>

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: Patch format

Mikhail Khludnev
FWIW,
I'm using git-svn-diff.sh to prepare patches before submitting 

Regards

On Wed, Apr 11, 2012 at 10:25 PM, Dawid Weiss <[hidden email]> wrote:
I don't think there are any differences other than:

1) prefix added by git which can be stripped with -p1,
2) binary patches incompatibility (doesn't seem to be of much
importance since we don't have jars anymore and binary test files can
be added separately).

Dawid

On Wed, Apr 11, 2012 at 8:21 PM, Benson Margulies <[hidden email]> wrote:
> On Wed, Apr 11, 2012 at 2:19 PM, Robert Muir <[hidden email]> wrote:
>> If its a patch from git/hg/etc, I just apply with patch -p1...
>> (ignoring the a/, b/ stuff)... are there any other traps? I've never
>> had any issue with that.
>
> Dunno. Perhaps Jan Høydahl would care to elaborate, as he is the
> person who suggested sticking to 'svn diff'?
>
>
>>
>> On Wed, Apr 11, 2012 at 2:14 PM, Benson Margulies <[hidden email]> wrote:
>>> I'm using the git mirror when making patches. Has anyone worked out a
>>> good way to get patches in the usual highly digestible subversion
>>> format when operating in this mode?
>>>
>>> ---------------------------------------------------------------------
>>> To unsubscribe, e-mail: [hidden email]
>>> For additional commands, e-mail: [hidden email]
>>>
>>
>>
>>
>> --
>> lucidimagination.com
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: [hidden email]
>> For additional commands, e-mail: [hidden email]
>>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: [hidden email]
> For additional commands, e-mail: [hidden email]
>

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]




--
Sincerely yours
Mikhail Khludnev