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.

Author ezio.melotti
Recipients chris.jerdonek, eric.araujo, ezio.melotti, ncoghlan, pitrou, sandro.tosi, terry.reedy, tshepang
Date 2013-01-09.06:38:44
SpamBayes Score -1.0
Marked as misclassified Yes
Message-id <1357713525.35.0.38971761707.issue14468@psf.upfronthosting.co.za>
In-reply-to
Content
> Can you try?  I would be surprised if it didn't.

IIRC it does a diff between the head of the cpython repo and the head of the linked one.

> Okay, then it sounds like they're more like sections that fit into
> the natural flow of the main body of text. 

Yes, the idea is that the first few FAQs describe the "regular" workflow in order (committing, merging, pushing), but than I was planning to mention a few other cases, e.g. null-merges or merge conflicts.  Some of these might already be in the FAQs.

FWIW I uploaded the rst file to make reviews easier.  I moved two sections that were not related to Mercurial to the top (Handling Others' Code and Contributor Licensing Agreements).  What I'm working on is the "Working with Mercurial" part.  Everything in there is either new or an adaptation of the previous text.  I also removed a couple of things (e.g. the differences between svnmerge and hg merge).
History
Date User Action Args
2013-01-09 06:38:45ezio.melottisetrecipients: + ezio.melotti, terry.reedy, ncoghlan, pitrou, eric.araujo, sandro.tosi, chris.jerdonek, tshepang
2013-01-09 06:38:45ezio.melottisetmessageid: <1357713525.35.0.38971761707.issue14468@psf.upfronthosting.co.za>
2013-01-09 06:38:45ezio.melottilinkissue14468 messages
2013-01-09 06:38:44ezio.melotticreate