[Python-Dev] devguide: Basic instructions on how to generate a patch with hg for non-committers.

Éric Araujo merwok at netwok.org
Sun Feb 6 19:10:37 CET 2011


Le 06/02/2011 17:15, Antoine Pitrou a écrit :
> On Sun, 06 Feb 2011 02:10:15 +0100
> brett.cannon <python-checkins at python.org> wrote:
>>  To create your patch, you should generate a unified diff from your checkout's
>>  top-level directory::
>>  
>> -    svn diff > patch.diff
>> +    hg outgoing --path > patch.diff
> 
> Should be --patch.
> The problem is that it will show one several patch per changeset, which
> is normally not what you want (it's a pity "hg out" doesn't have an
> option to collapse them all).

I suggest you request that feature upstream.

In the meantime, one can use hg diff -r $upstream-tip:tip to diff two
anonymous branches.  Using a named branch or local tags helps
identifying $upstream-tip.

Regards


More information about the Python-Dev mailing list