|
1185.1.29
by Robert Collins
merge merge tweaks from aaron, which includes latest .dev |
1 |
Types of conflict |
2 |
***************** |
|
3 |
||
4 |
The following types of conflict can be encountered during a merge, or |
|
5 |
a merge-like operation (such as resyncing local changes with |
|
6 |
upstream): |
|
7 |
||
8 |
Aaron's list: |
|
9 |
||
10 |
* Parent directory missing when attempting to add a file |
|
11 |
||
12 |
* Attempt to create directory that already exists |
|
13 |
||
14 |
* Some patch hunks failed to apply |
|
15 |
||
16 |
* While changing permissions, the "old" permissions in the changeset do |
|
17 |
not match the file. |
|
18 |
||
19 |
* While replacing contents of a file, the old contents of a file do not |
|
20 |
match the changeset |
|
21 |
||
22 |
* Attempt to remove non-empty directory: This only occurs when the |
|
23 |
directory has contents that it didn't have the last time it was deleted. |
|
24 |
It's pretty easy to handle adds, renames and deletes for exact |
|
25 |
patching. There's no need to rm -rf directories as tla does. |
|
26 |
||
27 |
* Attempt to create a symlink when there is already a file/dir/etc with |
|
28 |
that name |
|
29 |
||
30 |
* Attempt to apply a patch to a file that does not exist |
|
31 |
||
32 |
* Attempt to remove a file that does not exist |
|
33 |
||
34 |
* Attempt to rename a file that does not exist |
|
35 |
||
36 |
* Attempt to change permissions of a file that does not exist |
|
37 |
||
38 |
* Can't determine filename during three-way merging |
|
39 |
||
40 |
* Can't determine file parent directory during three-way merging |
|
41 |
||
42 |
* Can't determine file permissions during three-way merging |
|
43 |
||
44 |
Aaaron says: I have no doubt there are more. For example, attempt to |
|
45 |
change permissions of a symlink. |