Changes between Version 1 and Version 2 of BranchingPolicy


Ignore:
Timestamp:
08/26/10 13:01:48 (4 years ago)
Author:
rgrp
Comment:

Mention hg transplant

Legend:

Unmodified
Added
Removed
Modified
  • BranchingPolicy

    v1 v2  
    1717You might have written a bugfix in `default` that you want in `metastable` too, but don't want the rigmorole of releasing all the code in `default` at this point. In this case, don't merge - the problem with merging, is that you may well pull half-finished features from `default`. 
    1818 
    19 The solution (instead of `hg merge`) is to `hg export` particular changesets from one branch and `hg import` it to another. 
     19The solution (instead of `hg merge`) is to `hg transplant` (or `hg export` + `hg import`) particular changesets from one branch to another. 
    2020 
    2121== 'tip' note ==