Ezio Melotti added the comment: > 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). ---------- _______________________________________ Python tracker <rep...@bugs.python.org> <http://bugs.python.org/issue14468> _______________________________________ _______________________________________________ Python-bugs-list mailing list Unsubscribe: http://mail.python.org/mailman/options/python-bugs-list/archive%40mail-archive.com
