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

2011-02-08 Thread Brett Cannon
On Tue, Feb 8, 2011 at 05:26, Antoine Pitrou wrote: > On Sun, 6 Feb 2011 12:13:08 -0800 > Brett Cannon wrote: >> > >> > We could perhaps present SVN-like "work in the working copy" workflow >> > (without local commits), and let seasoned hg users choose other >> > workflows they like more (they do

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

2011-02-08 Thread Antoine Pitrou
On Sun, 6 Feb 2011 12:13:08 -0800 Brett Cannon wrote: > > > > We could perhaps present SVN-like "work in the working copy" workflow > > (without local commits), and let seasoned hg users choose other > > workflows they like more (they don't need our help anyway). > > I would rather give people so

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

2011-02-07 Thread Brendan Cully
On Monday, 07 February 2011 at 15:46, Antoine Pitrou wrote: > On Mon, 07 Feb 2011 14:34:35 + > Michael Foord wrote: > > >>> > > >> And from the description it sounds like rdiff will be very useful for > > >> our usecase. > > > I'm not sure it is really. When you commit multiple changesets > >

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

2011-02-07 Thread Dirkjan Ochtman
On Mon, Feb 7, 2011 at 15:46, Antoine Pitrou wrote: > I'm not advocating anything in particular really. I think creating a > named branch "foo" (or a bookmark? I've never used them but it sounds > like they might do the trick) and then using "hg di -r py3k" to get the > diff against upstream is ve

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

2011-02-07 Thread Antoine Pitrou
On Mon, 07 Feb 2011 14:34:35 + Michael Foord wrote: > >>> > >> And from the description it sounds like rdiff will be very useful for > >> our usecase. > > I'm not sure it is really. When you commit multiple changesets > > locally you really want to use something like named branches or mq to >

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

2011-02-07 Thread Michael Foord
On 07/02/2011 14:28, Antoine Pitrou wrote: On Mon, 07 Feb 2011 13:27:31 + Michael Foord wrote: On 07/02/2011 12:25, Georg Brandl wrote: Am 07.02.2011 00:21, schrieb Nick Coghlan: On Mon, Feb 7, 2011 at 6:53 AM, Brett Cannon wrote: I would rather not have new hg users have to install an

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

2011-02-07 Thread Antoine Pitrou
On Mon, 07 Feb 2011 13:27:31 + Michael Foord wrote: > On 07/02/2011 12:25, Georg Brandl wrote: > > Am 07.02.2011 00:21, schrieb Nick Coghlan: > >> On Mon, Feb 7, 2011 at 6:53 AM, Brett Cannon wrote: > >>> I would rather not have new hg users have to install an extension just > >>> to get a si

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

2011-02-07 Thread Antoine Pitrou
On Mon, 07 Feb 2011 13:26:28 +0100 Georg Brandl wrote: > Am 06.02.2011 21:13, schrieb Brett Cannon: > > >>> To undo a patch, you can revert **all** changes made in your checkout:: > >>> > >>> -svn revert -R . > >>> +hg revert --all > >>> + > >> > >> Or "hg revert -a", which is nicer to t

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

2011-02-07 Thread Michael Foord
On 07/02/2011 12:25, Georg Brandl wrote: Am 07.02.2011 00:21, schrieb Nick Coghlan: On Mon, Feb 7, 2011 at 6:53 AM, Brett Cannon wrote: I would rather not have new hg users have to install an extension just to get a simple workflow going. I may still keep my Rdiff-based FAQ entry around as an

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

2011-02-07 Thread Georg Brandl
Am 06.02.2011 21:13, schrieb Brett Cannon: >>> To undo a patch, you can revert **all** changes made in your checkout:: >>> >>> -svn revert -R . >>> +hg revert --all >>> + >> >> Or "hg revert -a", which is nicer to type. > > I prefer being explicit over implicit in the tutorial. BTW, the

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

2011-02-07 Thread Georg Brandl
Am 07.02.2011 00:21, schrieb Nick Coghlan: > On Mon, Feb 7, 2011 at 6:53 AM, Brett Cannon wrote: >> I would rather not have new hg users have to install an extension just >> to get a simple workflow going. > > I may still keep my Rdiff-based FAQ entry around as an example of how > to get a collap

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

2011-02-06 Thread Nick Coghlan
On Mon, Feb 7, 2011 at 6:53 AM, Brett Cannon wrote: > I would rather not have new hg users have to install an extension just > to get a simple workflow going. I may still keep my Rdiff-based FAQ entry around as an example of how to get a collapsed diff regardless of personal workflow, though. In

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

2011-02-06 Thread Brett Cannon
On Sun, Feb 6, 2011 at 12:36, Brendan Cully wrote: > On Sunday, 06 February 2011 at 12:13, Brett Cannon wrote: >> On Sun, Feb 6, 2011 at 08:15, Antoine Pitrou wrote: >> > On Sun, 06 Feb 2011 02:10:15 +0100 >> > brett.cannon wrote: >> >> >> >>  To create your patch, you should generate a unified

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

2011-02-06 Thread Brendan Cully
On Sunday, 06 February 2011 at 12:13, Brett Cannon wrote: > On Sun, Feb 6, 2011 at 08:15, Antoine Pitrou wrote: > > On Sun, 06 Feb 2011 02:10:15 +0100 > > brett.cannon wrote: > >> > >>  To create your patch, you should generate a unified diff from your > >> checkout's > >>  top-level directory::

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

2011-02-06 Thread Brett Cannon
On Sun, Feb 6, 2011 at 08:15, Antoine Pitrou wrote: > On Sun, 06 Feb 2011 02:10:15 +0100 > brett.cannon 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.dif

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

2011-02-06 Thread Antoine Pitrou
On Sun, 06 Feb 2011 19:10:37 +0100 Éric Araujo wrote: > Le 06/02/2011 17:15, Antoine Pitrou a écrit : > > On Sun, 06 Feb 2011 02:10:15 +0100 > > brett.cannon wrote: > >> To create your patch, you should generate a unified diff from your > >> checkout's > >> top-level directory:: > >> > >> -

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

2011-02-06 Thread Éric Araujo
Le 06/02/2011 17:15, Antoine Pitrou a écrit : > On Sun, 06 Feb 2011 02:10:15 +0100 > brett.cannon 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 > > S

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

2011-02-06 Thread Antoine Pitrou
On Sun, 06 Feb 2011 02:10:15 +0100 brett.cannon 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 seve