Repository navigation
mention work-around to create diffs in default/non-git mode #61135
Description
| BPO | 16931 |
|---|---|
| Nosy | @brettcannon, @ncoghlan, @ned-deily, @ezio-melotti, @merwok, @cjerdonek, @willingc |
Note: these values reflect the state of the issue at the time it was migrated and might not reflect the current state.
Show more details
GitHub fields:
assignee = 'https://github.com/willingc'
closed_at = <Date 2016-07-22.19:53:26.259>
created_at = <Date 2013-01-11.08:56:51.870>
labels = ['type-feature', 'docs']
title = 'mention work-around to create diffs in default/non-git mode'
updated_at = <Date 2016-07-22.19:53:26.257>
user = 'https://github.com/cjerdonek'bugs.python.org fields:
activity = <Date 2016-07-22.19:53:26.257>
actor = 'brett.cannon'
assignee = 'willingc'
closed = True
closed_date = <Date 2016-07-22.19:53:26.259>
closer = 'brett.cannon'
components = ['Devguide']
creation = <Date 2013-01-11.08:56:51.870>
creator = 'chris.jerdonek'
dependencies = []
files = []
hgrepos = []
issue_num = 16931
keywords = []
message_count = 5.0
messages = ['179654', '183085', '183127', '184144', '271021']
nosy_count = 8.0
nosy_names = ['brett.cannon', 'ncoghlan', 'ned.deily', 'ezio.melotti', 'eric.araujo', 'chris.jerdonek', 'tshepang', 'willingc']
pr_nums = []
priority = 'normal'
resolution = 'out of date'
stage = 'needs patch'
status = 'closed'
superseder = None
type = 'enhancement'
url = 'https://bugs.python.org/issue16931'
versions = []
Activity
cjerdonek commentedon Jan 11, 2013
This issue is to mention in the devguide how to create diffs with the changeset number when --git is configured on. Perhaps this can be done via a FAQ like: "How can I get Rietveld to work with a 2.7 patch?"
Background: Currently, the devguide recommends configuring Mercurial to use --git when making diffs. However, this causes the changeset ID to be left off of patch files and, for example, prevents Rietveld from working with patches to non-default branches. See also this thread:
http://mail.python.org/pipermail/python-dev/2011-March/108765.html
This issue describes a couple work-arounds:
http://bz.selenic.com/show_bug.cgi?id=3761
ned-deily commentedon Feb 26, 2013
However this is resolved, the information in the devguide should be consistent. AFAICT, the recommendation to use hg "git" format is currently only mentioned in the Committing section (http://docs.python.org/devguide/committing.html#minimal-configuration) but not elsewhere, in particular, not http://docs.python.org/devguide/patch.html. (This was brought up in bpo-10572.) Perhaps both sections could reference a FAQ entry which includes the Rietveld caveats.
cjerdonek commentedon Feb 27, 2013
Good observation. Personally, I think it makes sense to keep Mercurial information for both committers and non-committers (like configuring to use the "git" format) outside of the Mercurial section specific to committers. This can be in a general Mercurial section before the section specific to committers, or else spread throughout (e.g. in the FAQ).
ezio-melotti commentedon Mar 14, 2013
FWIW I'm leaning towards making the committing.rst page for committers only, and move general instructions for non-committers elsewhere. For this issue I think it might be OK to either add a FAQ about Rietveld that also mentions the git format, or possibly include it in a new "Rietveld" section somewhere in the tracker docs (see bpo-13963).
brettcannon commentedon Jul 22, 2016
With the pending migration to git, this probably isn't worth the effort.