Differences between revisions 8 and 9
Revision 8 as of 2012-12-21 19:20:43
Size: 712
Editor: JulianFoad
Comment:
Revision 9 as of 2012-12-21 20:42:13
Size: 0
Editor: JulianFoad
Comment: I merged all of this description into the wc_db_update_move.c top-of-file comment.
Deletions are marked like this. Additions are marked like this.
Line 1: Line 1:
Update brings in a *change* to a tree that is locally moved.

The starting point is: a local move from (say) A/B to X.

We design the update editor such that it brings in the new base node tree at A/B and marks a tree conflict on the move source (A/B). It does that unconditionally -- even if the destination of the move has no local changes to nodes that would be affected by the incoming change, or even if the move destination has no local changes at all.

The update-move phase is called after that update phase. In the update-move phase, we will not be making any changes in the source tree (A/B), we will only use that as a source of information for one side of the diff that we need to perform.