[issue16517] address merge conflicts in devguide null-merge instructions
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. -- ___ Python tracker rep...@bugs.python.org http://bugs.python.org/issue16517 ___ ___ Python-bugs-list mailing list Unsubscribe: http://mail.python.org/mailman/options/python-bugs-list/archive%40mail-archive.com
[issue16517] address merge conflicts in devguide null-merge instructions
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 :) -- ___ Python tracker rep...@bugs.python.org http://bugs.python.org/issue16517 ___ ___ Python-bugs-list mailing list Unsubscribe: http://mail.python.org/mailman/options/python-bugs-list/archive%40mail-archive.com
[issue16517] address merge conflicts in devguide null-merge instructions
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 rep...@bugs.python.org http://bugs.python.org/issue16517 ___ ___ Python-bugs-list mailing list Unsubscribe: http://mail.python.org/mailman/options/python-bugs-list/archive%40mail-archive.com
[issue16517] address merge conflicts in devguide null-merge instructions
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 rep...@bugs.python.org http://bugs.python.org/issue16517 ___ ___ Python-bugs-list mailing list Unsubscribe: http://mail.python.org/mailman/options/python-bugs-list/archive%40mail-archive.com
[issue16517] address merge conflicts in devguide null-merge instructions
Changes by Jesús Cea Avión j...@jcea.es: -- nosy: +jcea ___ Python tracker rep...@bugs.python.org http://bugs.python.org/issue16517 ___ ___ Python-bugs-list mailing list Unsubscribe: http://mail.python.org/mailman/options/python-bugs-list/archive%40mail-archive.com
[issue16517] address merge conflicts in devguide null-merge instructions
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 ___ Python tracker rep...@bugs.python.org http://bugs.python.org/issue16517 ___ ___ Python-bugs-list mailing list Unsubscribe: http://mail.python.org/mailman/options/python-bugs-list/archive%40mail-archive.com
[issue16517] address merge conflicts in devguide null-merge instructions
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 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.] -- assignee: chris.jerdonek components: Devguide files: issue-null-merge-1.patch keywords: easy, patch messages: 176041 nosy: chris.jerdonek, eric.araujo, ezio.melotti, ncoghlan, r.david.murray priority: normal severity: normal stage: patch review status: open title: address merge conflicts in devguide null-merge instructions type: enhancement Added file: http://bugs.python.org/file28059/issue-null-merge-1.patch ___ Python tracker rep...@bugs.python.org http://bugs.python.org/issue16517 ___ ___ Python-bugs-list mailing list Unsubscribe: http://mail.python.org/mailman/options/python-bugs-list/archive%40mail-archive.com
