← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/merge.txt

  • Committer: Robert Collins
  • Date: 2010-04-08 04:34:03 UTC
  • mfrom: (5138 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5139.
  • Revision ID: robertc@robertcollins.net-20100408043403-56z0d07vdqrx7f3t
Update bugfix for 528114 to trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/merge.txt
1
 
Merging
2
 
=======
3
 
 
4
 
There should be one merge command which does the right thing, and
5
 
which is called 'merge'.
6
 
 
7
 
The merge command pulls a changeset or a range of changesets into your
8
 
tree.  It knows what changes have already been integrated and avoids
9
 
pulling them again.
10
 
 
11
 
There should be some intelligence about working out what changes have
12
 
already been merged. 
13
 
 
14
 
The tool intelligently chooses (or perhaps synthesizes) an ancestor
15
 
and two trees to merge.  These are then intelligently merged.
16
 
 
17
 
Merge should refuse to run (unless forced) if there are any
18
 
uncommitted changes in your tree beforehand.  This has two purposes:
19
 
if you mess up the merge you won't lose anything important; secondly
20
 
this makes it more likely that the merge will be relatively pure.