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.

Title: address merge conflicts in devguide null-merge instructions
Type: enhancement Stage: resolved
Components: Devguide Versions:
Status: closed Resolution: fixed
Dependencies: Superseder:
Assigned To: chris.jerdonek Nosy List: chris.jerdonek, eric.araujo, ezio.melotti, jcea, ncoghlan, pitrou, r.david.murray
Priority: normal Keywords: easy, patch

Created on 2012-11-21 05:32 by chris.jerdonek, last changed 2022-04-11 14:57 by admin. This issue is now closed.

File name Uploaded Description Edit
issue-null-merge-1.patch chris.jerdonek, 2012-11-21 05:32
issue-16517-2.patch chris.jerdonek, 2012-11-21 13:12
Messages (6)
msg176041 - (view) Author: Chris Jerdonek (chris.jerdonek) * (Python committer) Date: 2012-11-21 05:32
The null-merge instructions in the devguide (in the "note" box in the section linked to below):

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.]
msg176051 - (view) Author: Ezio Melotti (ezio.melotti) * (Python committer) Date: 2012-11-21 11:35
+      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.
msg176053 - (view) Author: R. David Murray (r.david.murray) * (Python committer) Date: 2012-11-21 12:23
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 :)
msg176054 - (view) Author: Chris Jerdonek (chris.jerdonek) * (Python committer) Date: 2012-11-21 12:27
> Is there a bug report for this on the mercurial tracker?

Indeed there is -- by one of our own in fact :)
msg176056 - (view) Author: Chris Jerdonek (chris.jerdonek) * (Python committer) Date: 2012-11-21 13:12
Attaching new patch incorporating David's suggestions.
msg176089 - (view) Author: Chris Jerdonek (chris.jerdonek) * (Python committer) Date: 2012-11-22 02:10
Addressed by:

(I accidentally left the issue number out of the commit message.)
Date User Action Args
2022-04-11 14:57:38adminsetgithub: 60721
2012-11-22 02:10:28chris.jerdoneksetstatus: open -> closed
resolution: fixed
messages: + msg176089

stage: patch review -> resolved
2012-11-22 00:38:00jceasetnosy: + jcea
2012-11-21 13:12:26chris.jerdoneksetfiles: + issue-16517-2.patch

messages: + msg176056
2012-11-21 12:27:41chris.jerdoneksetnosy: + pitrou
messages: + msg176054
2012-11-21 12:23:28r.david.murraysetmessages: + msg176053
2012-11-21 11:35:39ezio.melottisetmessages: + msg176051
2012-11-21 05:32:27chris.jerdonekcreate