Commits

Anonymous committed 7848c29

Backporting is obsolete. Add details that I had to learn.
(Loading project files otherwise generates an error/warning with Express.)

Comments (0)

Files changed (3)

 Branches
 ''''''''
 
-Different branches are used at a time to represent different *minor versions*
-in which development is made.  All development should be done **first** in the
-:ref:`in-development <indevbranch>` branch, and selectively backported
-to other branches when necessary.
+There is a branch for each *minor version*. Development is done separately
+for Python 2 and Python 3. For each *major version*, each change should be made
+**first** in the oldest branch to which it applies and forward-ported as
+appropriate.
 
 
 .. _indevbranch:
 
 If you have push rights, you need to configure Mercurial to work with
 your SSH keys.  For that, open your Mercurial configuration file
-(you can do so by opening the TortoiseHg configuration dialog and then
-clicking *"Edit File"*).  In the ``[ui]`` section, add the following line::
+(you can do so by opening the TortoiseHg Global Settings dialog and then
+clicking *"Edit File"*).  If there is no ``[ui]`` section, create it by
+typing just that on a line by itself. Then add the following line::
 
    ssh = TortoisePlink.exe -ssh -2 -C -i C:\path\to\yourkey.ppk
 
 is sufficient. Its limitations are given at
 http://msdn.microsoft.com/en-us/library/hs24szh9%28v=VS.90%29.aspx .
 
-To build from the Visual Studio GUI, load the project files and press F7. Make
-sure you have chosen the "Debug" build first.
+To build from the Visual Studio GUI, open pcbuild.sln to load the project
+files and press F7. Make sure you have chosen the "Debug" build first.
 
 Once built you might want to set Python as a startup project. Pressing F5 in
 Visual Studio will launch the interpreter.
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.