➜

This issue tracker has been migrated to GitHub, and is currently read-only.
For more information, see the GitHub FAQs in the Python's Developer Guide.

Author chris.jerdonek
Recipients chris.jerdonek, eric.araujo, ezio.melotti, ncoghlan, r.david.murray
Date 2012-11-21.05:32:25
SpamBayes Score -1.0
Marked as misclassified Yes
Message-id <1353475947.45.0.611310875151.issue16517@psf.upfronthosting.co.za>
In-reply-to
Content 
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 instructions on how to resolve this scenario.  Proposed patch attached.  (Am I right that the `hg resolve` is required?)

[Also adding David since this or a related topic came up with him on IRC a couple(?) months back.]
History
Date User Action Args
2012-11-21 05:32:27chris.jerdoneksetrecipients: + chris.jerdonek, ncoghlan, ezio.melotti, eric.araujo, r.david.murray
2012-11-21 05:32:27chris.jerdoneksetmessageid: <1353475947.45.0.611310875151.issue16517@psf.upfronthosting.co.za>
2012-11-21 05:32:27chris.jerdoneklinkissue16517 messages
2012-11-21 05:32:26chris.jerdonekcreate