Hi Ezio, thanks for the review: how about this new version of the patch? I've left the more "verbose" version in the 3.2 example, while used the more compact way for the 2.7. Also since I cloned 2.7 using p圓k#2.7, I don't think I would be able to graft a p圓 changeset in 2.7 (but it should work the other way around). I first commit on 2.7, export/import on 3.2, merge with 3.3).
There are a few differences between the process you describe and the one I personally use (e.g. It's also possible to do "hg clone p圓k#3.2 p圓.2". While the second command is more concise, I find the first easier to understand, so maybe you could leave both the first time (proposing the concise one as an alternative), and then use just the second. add of "The import is possible." sentence add of "Assuming all your clones are in the same directory" change in commands to reflect the multi-clone setup I've also changed quite some part of "Porting Within *" sections - please look at them carefully since it's not that evident. I'm sorry but probably 'hg diff' went too wild, and since I moved the "Using several working copies" as the first sub-paragraph of "Forward-Porting" it seems it got confused, so the diff is not so clean. It is important to note that if you have a 'cpython' as a clone (which pulls and pushed to hg.) and from it you clone '2.7' and '3.2' (as I think it's the most common setup) you first have to pull from cpython and then on the other 2.Īnyhow, is anyone up for preparing a patch? else I'll happily work on it in the coming days. The initial re-creation of the recent DAG for each branch when starting up Workbench takes some time, but having the graph makes it immediately obvious whether the repository is in a proper state - two heads for default and 2.7, three for 3.2 - both before starting work after pulling from py.org and again when ready to push changes back. I also think TortoiseHG should get more than just a mention. Having to skip over the wrong instructions made getting started a bit harder for me.
I don’t think anyone uses the one-clone-with-update approach, so I think we should rewrite the instructions to talk about one clone per version.
Tortoisehg user fixed in hgrc update#
I’ve always used one clone per Python version, where I can keep the compiled artifacts it makes it easy to see what a file looks like in any of the three versions, easy to work on different things in the different repos (like fixing something in 3.2 that you noticed while you were adding something to 3.3), it is cheap thanks to hardlinks, fast because you run hg pull instead of hg update to merge a patch from 3.2, and is just the simplest thing that works. This is only practical if you build Python in a custom (sub)directory, otherwise you’d need to either do the configure-make-test dance when merging/porting patches, or skip testing.
The devguide recommends using hg update to switch between branches in one repository. Moves FAQs in two subsections - no content changes Filesģ-update_active_branches_and_mergin_order.diffĥ-update_merge_between_major_versions.diff Chris.jerdonek, eric.araujo, lotti, ncoghlan, ned.deily, pitrou, python-dev, sandro.tosi, terry.reedy, tshepangĬreated on 16:07 by eric.araujo, last changed 14:57 by admin.
0 kommentar(er)
