← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Vincent Ladeuil
  • Date: 2010-01-21 09:13:03 UTC
  • mfrom: (4971.3.3 fix-481526)
  • mto: This revision was merged to the branch mainline in revision 4980.
  • Revision ID: v.ladeuil+lp@free.fr-20100121091303-pp8rh4xgblyzo734
Add documentation for multi-parent merges

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
3647
3647
    committed to record the result of the merge.
3648
3648
 
3649
3649
    merge refuses to run if there are any uncommitted changes, unless
3650
 
    --force is given.  
 
3650
    --force is given. The --force option can also be used to create a
 
3651
    merge revision which has more than two parents.
3651
3652
 
3652
3653
    If one would like to merge changes from the working tree of the other
3653
3654
    branch without merging any committed revisions, the --uncommitted option
3672
3673
        To apply a merge directive contained in /tmp/merge::
3673
3674
 
3674
3675
            bzr merge /tmp/merge
 
3676
 
 
3677
        To create a merge revision with three parents from two branches
 
3678
        feature1a and feature1b:
 
3679
 
 
3680
            bzr merge ../feature1a
 
3681
            bzr merge ../feature1b --force
 
3682
            bzr commit -m 'revision with three parents'
3675
3683
    """
3676
3684
 
3677
3685
    encoding_type = 'exact'