Changes between Version 2 and Version 3 of VersionsAndBranching


Ignore:
Timestamp:
08/26/10 09:10:37 (4 years ago)
Author:
dread
Comment:

add info on hg import/export

Legend:

Unmodified
Added
Removed
Modified
  • VersionsAndBranching

    v2 v3  
    1515You 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. 
    1616 
    17 The solution instead is to ... (tbc) 
     17The solution (instead of 'hg merge') is to 'hg export' particular changesets from one branch and 'hg import' it to another. 
    1818 
    1919== Notes ==