[issue18390] Better documenting of ``hg revert -r`` when merging with another branch

2013-07-12 Thread Roundup Robot

Roundup Robot added the comment:

New changeset 15249b189347 by Brett Cannon in branch 'default':
Issue #18390: Add a little comment on how to do a proper file
http://hg.python.org/devguide/rev/15249b189347

--
nosy: +python-dev

___
Python tracker 

___
___
Python-bugs-list mailing list
Unsubscribe: 
http://mail.python.org/mailman/options/python-bugs-list/archive%40mail-archive.com



[issue18390] Better documenting of ``hg revert -r`` when merging with another branch

2013-07-12 Thread Brett Cannon

Changes by Brett Cannon :


--
resolution:  -> fixed
stage: needs patch -> committed/rejected
status: open -> closed

___
Python tracker 

___
___
Python-bugs-list mailing list
Unsubscribe: 
http://mail.python.org/mailman/options/python-bugs-list/archive%40mail-archive.com



[issue18390] Better documenting of ``hg revert -r`` when merging with another branch

2013-07-06 Thread Brett Cannon

New submission from Brett Cannon:

While the dev FAQ mentions it under null merges 
(http://docs.python.org/devguide/faq.html#how-do-i-make-a-null-merge), it 
probably should mention it under the merging section of 
http://docs.python.org/devguide/committing.html#merging-between-different-branches-within-the-same-major-version.

--
assignee: brett.cannon
components: Devguide
keywords: easy
messages: 192494
nosy: brett.cannon, ezio.melotti
priority: normal
severity: normal
stage: needs patch
status: open
title: Better documenting of ``hg revert -r`` when merging with another branch

___
Python tracker 

___
___
Python-bugs-list mailing list
Unsubscribe: 
http://mail.python.org/mailman/options/python-bugs-list/archive%40mail-archive.com