~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/developers/revert.txt

  • Committer: Vincent Ladeuil
  • Date: 2010-02-10 15:46:03 UTC
  • mfrom: (4985.3.21 update)
  • mto: This revision was merged to the branch mainline in revision 5021.
  • Revision ID: v.ladeuil+lp@free.fr-20100210154603-k4no1gvfuqpzrw7p
Update performs two merges in a more logical order but stop on conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
21
21
 1. Use the hash tree data to tune the work done in finding matching paths/ids which are different in the two trees.
22
22
 
23
23
For each thing that needs to change - group by target directory?
24
 
 
 
24
 
25
25
 1. Extract new content.
26
26
 1. Backup old content or replace-in-place (except windows where we move and replace).