Changes between Version 2 and Version 3 of VersionsAndBranching

Timestamp:

08/26/10 09:10:37 (4 years ago)

Author:

dread

Comment:

add info on hg import/export

VersionsAndBranching

@@ -15 +15 @@
 You might have written a bugfix in `default` that you want in `metastable` too, but don't want the rigmorole of releasing at this point. In this case, don't merge - the problem with merging when you're not releasing, is that you may well pull half-finished features from `default` into branches which need to be more stable.
 
-The solution instead is to ... (tbc)
+The solution (instead of 'hg merge') is to 'hg export' particular changesets from one branch and 'hg import' it to another.
 
 == Notes ==