]> git.ipfire.org Git - thirdparty/git.git/blob - t/t9602/README
Merge branch 'ms/fetch-follow-tag-optim'
[thirdparty/git.git] / t / t9602 / README
1 This repository is for testing the ability to group revisions
2 correctly along tags and branches. Here is its history:
3
4 1. The initial import (revision 1.1 of everybody) created a
5 directory structure with a file named `default' in each dir:
6
7 ./
8 default
9 sub1/default
10 subsubA/default
11 subsubB/default
12 sub2/default
13 subsubA/default
14 sub3/default
15
16 2. Then tagged everyone with T_ALL_INITIAL_FILES.
17
18 3. Then tagged everyone except sub1/subsubB/default with
19 T_ALL_INITIAL_FILES_BUT_ONE.
20
21 4. Then created branch B_FROM_INITIALS on everyone.
22
23 5. Then created branch B_FROM_INITIALS_BUT_ONE on everyone except
24 /sub1/subsubB/default.
25
26 6. Then committed modifications to two files: sub3/default, and
27 sub1/subsubA/default.
28
29 7. Then committed a modification to all 7 files.
30
31 8. Then backdated sub3/default to revision 1.2, and
32 sub2/subsubA/default to revision 1.1, and tagged with T_MIXED.
33
34 9. Same as 8, but tagged with -b to create branch B_MIXED.
35
36 10. Switched the working copy to B_MIXED, and added
37 sub2/branch_B_MIXED_only. (That's why the RCS file is in
38 sub2/Attic/ -- it never existed on trunk.)
39
40 11. In one commit, modified default, sub1/default, and
41 sub2/subsubA/default, on branch B_MIXED.
42
43 12. Did "cvs up -A" on sub2/default, then in one commit, made a
44 change to sub2/default and sub2/branch_B_MIXED_only. So this
45 commit should be spread between the branch and the trunk.
46
47 13. Do "cvs up -A" to get everyone back to trunk, then make a new
48 branch B_SPLIT on everyone except sub1/subsubB/default,v.
49
50 14. Switch to branch B_SPLIT (see sub1/subsubB/default disappear)
51 and commit a change that affects everyone except sub3/default.
52
53 15. An hour or so later, "cvs up -A" to get sub1/subsubB/default
54 back, then commit a change on that file, on trunk. (It's
55 important that this change happened after the previous commits
56 on B_SPLIT.)
57
58 16. Branch sub1/subsubB/default to B_SPLIT, then "cvs up -r B_SPLIT"
59 to switch the whole working copy to the branch.
60
61 17. Commit a change on B_SPLIT, to sub1/subsubB/default and
62 sub3/default.