[issue16517] address merge conflicts in devguide null-merge instructions

2012-11-21 Thread Chris Jerdonek
Chris Jerdonek added the comment: Addressed by: http://hg.python.org/devguide/rev/78a69b929ab7 (I accidentally left the issue number out of the commit message.) -- resolution: -> fixed stage: patch review -> committed/rejected status: open -> closed ___

[issue16517] address merge conflicts in devguide null-merge instructions

2012-11-21 Thread Jesús Cea Avión
Changes by Jesús Cea Avión : -- nosy: +jcea ___ Python tracker ___ ___ Python-bugs-list mailing list Unsubscribe: http://mail.python.

[issue16517] address merge conflicts in devguide null-merge instructions

2012-11-21 Thread Chris Jerdonek
Chris Jerdonek added the comment: Attaching new patch incorporating David's suggestions. -- Added file: http://bugs.python.org/file28062/issue-16517-2.patch ___ Python tracker __

[issue16517] address merge conflicts in devguide null-merge instructions

2012-11-21 Thread Chris Jerdonek
Chris Jerdonek added the comment: > Is there a bug report for this on the mercurial tracker? Indeed there is -- by one of our own in fact :) http://bz.selenic.com/show_bug.cgi?id=2706 -- nosy: +pitrou ___ Python tracker

[issue16517] address merge conflicts in devguide null-merge instructions

2012-11-21 Thread R. David Murray
R. David Murray added the comment: Yes, so I suppose you could add a footnote that says "using a three way merge tool generally makes this step unnecessary". Is there a bug report for this on the mercurial tracker? If so we could link to the bug report :) --

[issue16517] address merge conflicts in devguide null-merge instructions

2012-11-21 Thread Ezio Melotti
Ezio Melotti added the comment: + hg resolve -am # needed only if the merge created conflicts IIUC it's necessary, but only if you had a conflict and hg didn't invoke a 3-way merge tool. Here I use kdiff3, and I rarely have to use hg resolve. --

[issue16517] address merge conflicts in devguide null-merge instructions

2012-11-20 Thread Chris Jerdonek
New submission from Chris Jerdonek: The null-merge instructions in the devguide (in the "note" box in the section linked to below): http://docs.python.org/devguide/committing.html#porting-within-a-major-version are incomplete if the merge created conflicts. It would help to include instructi