← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/developers/lca-merge.txt

  • Committer: Vincent Ladeuil
  • Date: 2010-02-11 09:27:55 UTC
  • mfrom: (5017.3.46 test-servers)
  • mto: This revision was merged to the branch mainline in revision 5030.
  • Revision ID: v.ladeuil+lp@free.fr-20100211092755-3vvu4vbwiwjjte3s
Move tests servers from bzrlib.transport to bzrlib.tests.test_server

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/developers/lca-merge.txt
49
49
in some, but not all, LCAs.  We can assume that all LCAs were produced
50
50
by merges of the same sets of revisions.  That means that in those LCAs,
51
51
there were different merge resolutions.  Since THIS and OTHER disagree
52
 
about whether the line is present, those differences have propogated
 
52
about whether the line is present, those differences have propagated
53
53
into THIS and OTHER.  Therefore, we should declare that the lines are in
54
54
conflict, and let the user handle the issue.
55
55