|
⇤ ← Revision 1 as of 2006-03-30 21:09:47
Size: 812
Comment:
|
Size: 839
Comment:
|
| Deletions are marked like this. | Additions are marked like this. |
| Line 18: | Line 18: |
| ---- CategoryNewFeatures |
So there are probably a couple steps:
- get manifests
- eliminate unchanged files
- detect non-overlapped files (files not in both manifests)
- put all "new" files in a "post" list.
- go through each remaining file, attempt a merge.
- if, while merging, we
- discover no common ancestor, we've hit a rename. Add the file to
- the post list.
- discover no common ancestor, we've hit a rename. Add the file to
- once we have the post list (and have merged all non-renamed/copied files) we can find all the rename links
- find ancestors across renames
- do a second pass of 3-way merging
- the big open question is do we always want to merge-across-copy or
- do we want to prompt? (my suspicion is always.)
- there's a directory rename detection heuristic that's needed here as well and can be done during the
- overlap detection