directory-rename-detection.txt: update references to regression tests
The regression tests for directory rename detection were renamed from t6043 to t6423 in commit 919df31955 ("Collect merge-related tests to t64xx", 2020-08-10); update this file to match. Also, add a small clarification to nearby text while we're at it. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Elijah Newren committed
Oct 15, 2020 at 20:46 UTC
b9718d0cc98dcdf0012ba0bef8112068c6b2e1e4
1 file changed
+4
-3
Documentation/technical/directory-rename-detection.txt
+4
-3
@@ -18,7 +18,8 @@ It is perhaps easiest to start with an example:
18
More interesting possibilities exist, though, such as:
19
20
* one side of history renames x -> z, and the other renames some file to
21
- x/e, causing the need for the merge to do a transitive rename.
21
+ x/e, causing the need for the merge to do a transitive rename so that
22
+ the rename ends up at z/e.
23
24
* one side of history renames x -> z, but also renames all files within x.
25
For example, x/a -> z/alpha, x/b -> z/bravo, etc.
@@ -35,7 +36,7 @@ More interesting possibilities exist, though, such as:
36
directory itself contained inner directories that were renamed to yet
37
other locations).
38
38
- * combinations of the above; see t/t6043-merge-rename-directories.sh for
39
+ * combinations of the above; see t/t6423-merge-rename-directories.sh for
40
various interesting cases.
41
42
Limitations -- applicability of directory renames
@@ -62,7 +63,7 @@ directory rename detection applies:
63
Limitations -- detailed rules and testcases
64
-------------------------------------------
65
65
-t/t6043-merge-rename-directories.sh contains extensive tests and commentary
66
+t/t6423-merge-rename-directories.sh contains extensive tests and commentary
67
which generate and explore the rules listed above. It also lists a few
68
additional rules:
69