Title: FAQ item 2.25 is unclear
Type: Stage:
Components: Versions:
Status: closed Resolution: out of date
Dependencies: Superseder:
Assigned To: brett.cannon Nosy List: brett.cannon, exarkun, orsenthil
Priority: normal Keywords:

Created on 2010-05-08 15:33 by exarkun, last changed 2011-06-27 00:35 by brett.cannon. This issue is now closed.

Messages (3)
msg105300 - (view) Author: Jean-Paul Calderone (exarkun) * (Python committer) Date: 2010-05-08 15:33
The item "How do I prepare a new branch for merging?" is unclear about which branch needs to be prepared.  It could be the source branch or the destination branch.  In #python-dev, I learned that it's probably the destination branch being discussed here.  This should be clarified (and it could also be pointed out that it is almost always the case that this step has been done by someone else already).
msg105306 - (view) Author: Senthil Kumaran (orsenthil) * (Python committer) Date: 2010-05-08 16:10
I would also suggest a re-ordering of FAQ entries in this manner:

1st  What tools do I need to merge between branches?
2nd  How do I merge between branches?

And then,
How do I prepare a new branch for merging?

With the explanation/clarification.
msg139232 - (view) Author: Brett Cannon (brett.cannon) * (Python committer) Date: 2011-06-27 00:35
This is out of date thanks to the rewrite of the FAQ for Mercurial.
Date User Action Args
2011-06-27 00:35:09brett.cannonsetstatus: open -> closed
resolution: out of date
messages: + msg139232
2010-05-08 16:10:58orsenthilsetnosy: + orsenthil
messages: + msg105306
2010-05-08 15:59:50benjamin.petersonsetassignee: brett.cannon

nosy: + brett.cannon
2010-05-08 15:33:40exarkuncreate