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

[Antoine Pitrou]

On Sun, 06 Feb 2011 19:10:37 +0100
Éric Araujo <merwok at netwok.org> wrote:
> 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.

Yes. But that's where we start advocating a particular local workflow
over another (why named branches rather than mercurial queues or
bookmarks, for example?). That's why I think that part of the devguide
should stick to a trivial SVN-like use, letting people learn about more
powerful options in other resources.

Regards

Antoine.