Re: [Python-Dev] devguide: Cover how to (un-)apply a patch.

2011-01-19 Thread Nick Coghlan
On Wed, Jan 19, 2011 at 5:32 AM, s...@pobox.com wrote: The odds that someone will remember the syntax for the diff command for the VCS are much higher than the revert command.  My guess is diff is executed more often than any other version control commands except update and commit, and far

Re: [Python-Dev] devguide: Cover how to (un-)apply a patch.

2011-01-19 Thread skip
Nick Usually, this is because I will have edited the source tree since Nick applying the patch. Reversion has the advantage of not getting Nick confused by any additional changes. I also usually use svn diff Nick to save a copy before I revert in case I change my mind. I

Re: [Python-Dev] devguide: Cover how to (un-)apply a patch.

2011-01-19 Thread Steven D'Aprano
s...@pobox.com wrote: I realize the world is passing me by and that I'm rapidly turning into a dinosaur w.r.t. distributed version control, but as you write/update the developer's guide remember that proficiency in Python does not necessarily equate to proficiency in version control systems,

Re: [Python-Dev] devguide: Cover how to (un-)apply a patch.

2011-01-19 Thread Antoine Pitrou
On Thu, 20 Jan 2011 01:23:26 +1100 Steven D'Aprano st...@pearwood.info wrote: s...@pobox.com wrote: I realize the world is passing me by and that I'm rapidly turning into a dinosaur w.r.t. distributed version control, but as you write/update the developer's guide remember that proficiency

Re: [Python-Dev] devguide: Cover how to (un-)apply a patch.

2011-01-19 Thread Steven D'Aprano
Antoine Pitrou wrote: On Thu, 20 Jan 2011 01:23:26 +1100 Steven D'Aprano st...@pearwood.info wrote: s...@pobox.com wrote: I realize the world is passing me by and that I'm rapidly turning into a dinosaur w.r.t. distributed version control, but as you write/update the developer's guide

Re: [Python-Dev] devguide: Cover how to (un-)apply a patch.

2011-01-19 Thread Antoine Pitrou
On Thu, 20 Jan 2011 01:54:37 +1100 Steven D'Aprano st...@pearwood.info wrote: You'll have to ask Skip if he thinks there's a concrete problem. I haven't seen one, but I've only been reading this thread with one eye and it may be I've missed the mother of all problems. The (non-concrete)

Re: [Python-Dev] devguide: Cover how to (un-)apply a patch.

2011-01-19 Thread skip
What he said, only bolded and underlined. Antoine I'm not sure what the issue is. Is there something, concretely, Antoine that needs to be fixed? Strictly speaking, nothing needs to be fixed because nothing is broken. Rephrasing my earlier messages: 1. Being a sophisticated

Re: [Python-Dev] devguide: Cover how to (un-)apply a patch.

2011-01-19 Thread Bill Janssen
Steven D'Aprano st...@pearwood.info wrote: s...@pobox.com wrote: I realize the world is passing me by and that I'm rapidly turning into a dinosaur w.r.t. distributed version control, but as you write/update the developer's guide remember that proficiency in Python does not necessarily

Re: [Python-Dev] devguide: Cover how to (un-)apply a patch.

2011-01-19 Thread Antoine Pitrou
On Wed, 19 Jan 2011 10:36:04 -0600 s...@pobox.com wrote: What he said, only bolded and underlined. Antoine I'm not sure what the issue is. Is there something, concretely, Antoine that needs to be fixed? Strictly speaking, nothing needs to be fixed because nothing is broken.

Re: [Python-Dev] devguide: Cover how to (un-)apply a patch.

2011-01-19 Thread skip
Antoine Ok, thank you but... are you suggesting something or not? Yes. Keep the vcs command recommendations simple. At least mention idioms which likely to apply across a wider range of version control systems. S ___ Python-Dev mailing list

Re: [Python-Dev] devguide: Cover how to (un-)apply a patch.

2011-01-19 Thread Michael Foord
On 19/01/2011 11:35, Nick Coghlan wrote: On Wed, Jan 19, 2011 at 5:32 AM,s...@pobox.com wrote: The odds that someone will remember the syntax for the diff command for the VCS are much higher than the revert command. My guess is diff is executed more often than any other version control

Re: [Python-Dev] devguide: Cover how to (un-)apply a patch.

2011-01-19 Thread Michael Foord
On 19/01/2011 19:10, s...@pobox.com wrote: Antoine Ok, thank you but... are you suggesting something or not? Yes. Keep the vcs command recommendations simple. At least mention idioms which likely to apply across a wider range of version control systems. The revert works with svn, hg

Re: [Python-Dev] devguide: Cover how to (un-)apply a patch.

2011-01-19 Thread Brett Cannon
On Wed, Jan 19, 2011 at 10:10, s...@pobox.com wrote:    Antoine Ok, thank you but... are you suggesting something or not? Yes.  Keep the vcs command recommendations simple.  At least mention idioms which likely to apply across a wider range of version control systems. I was hoping this

Re: [Python-Dev] devguide: Cover how to (un-)apply a patch.

2011-01-19 Thread Benjamin Peterson
2011/1/19 Michael Foord fuzzy...@voidspace.org.uk: On 19/01/2011 19:10, s...@pobox.com wrote:     Antoine  Ok, thank you but... are you suggesting something or not? Yes.  Keep the vcs command recommendations simple.  At least mention idioms which likely to apply across a wider range of

Re: [Python-Dev] devguide: Cover how to (un-)apply a patch.

2011-01-19 Thread Antoine Pitrou
The revert works with svn, hg and bzr. Using patch is not going to work on Windoze unless cygwin has been installed. I thought you were supposed to use some variant of update on hg instead revert, though. I think what is discouraged is to hg revert to a different revision. We are talking

Re: [Python-Dev] devguide: Cover how to (un-)apply a patch.

2011-01-19 Thread Terry Reedy
On 1/19/2011 1:25 PM, Brett Cannon wrote: On Wed, Jan 19, 2011 at 10:10,s...@pobox.com wrote: Antoine Ok, thank you but... are you suggesting something or not? Yes. Keep the vcs command recommendations simple. At least mention idioms which likely to apply across a wider range of

Re: [Python-Dev] devguide: Cover how to (un-)apply a patch.

2011-01-19 Thread Michael Foord
On 19/01/2011 19:47, Antoine Pitrou wrote: On Wed, 19 Jan 2011 19:20:01 +0100 Michael Foordfuzzy...@voidspace.org.uk wrote: On 19/01/2011 19:10, s...@pobox.com wrote: Antoine Ok, thank you but... are you suggesting something or not? Yes. Keep the vcs command recommendations simple.

Re: [Python-Dev] devguide: Cover how to (un-)apply a patch.

2011-01-18 Thread Oleg Broytman
On Mon, Jan 17, 2011 at 06:19:50PM -0600, s...@pobox.com wrote: Antoine On Mon, 17 Jan 2011 23:37:07 +0100 Antoine brett.cannon python-check...@python.org wrote: + +To undo a patch, do:: + +patch -R -p0 patch.diff + Antoine Or, simply and more

Re: [Python-Dev] devguide: Cover how to (un-)apply a patch.

2011-01-18 Thread skip
I prefer Brett's solution. It's one command instead of one command per VCS. It works with other version control systems and provides me the opportunity to save a copy I can restore later. Georg It assumes you already have the copy. Sure, but the way to get the input to the

Re: [Python-Dev] devguide: Cover how to (un-)apply a patch.

2011-01-17 Thread Antoine Pitrou
On Mon, 17 Jan 2011 23:37:07 +0100 brett.cannon python-check...@python.org wrote: + +To undo a patch, do:: + +patch -R -p0 patch.diff + Or, simply and more reliably, use the corresponding VCS incantation (svn revert -R . or hg revert -a). Regards Antoine.

Re: [Python-Dev] devguide: Cover how to (un-)apply a patch.

2011-01-17 Thread Brett Cannon
Done On Mon, Jan 17, 2011 at 15:14, Antoine Pitrou solip...@pitrou.net wrote: On Mon, 17 Jan 2011 23:37:07 +0100 brett.cannon python-check...@python.org wrote: + +To undo a patch, do:: + +    patch -R -p0 patch.diff + Or, simply and more reliably, use the corresponding VCS incantation

Re: [Python-Dev] devguide: Cover how to (un-)apply a patch.

2011-01-17 Thread skip
Antoine On Mon, 17 Jan 2011 23:37:07 +0100 Antoine brett.cannon python-check...@python.org wrote: + +To undo a patch, do:: + +patch -R -p0 patch.diff + Antoine Or, simply and more reliably, use the corresponding VCS Antoine incantation (svn revert -R

Re: [Python-Dev] devguide: Cover how to (un-)apply a patch.

2011-01-17 Thread Georg Brandl
Am 18.01.2011 01:19, schrieb s...@pobox.com: Antoine On Mon, 17 Jan 2011 23:37:07 +0100 Antoine brett.cannon python-check...@python.org wrote: + +To undo a patch, do:: + +patch -R -p0 patch.diff + Antoine Or, simply and more reliably, use the