Fossil SCM
|
1
|
# |
|
2
|
# Tests for merging with renames |
|
3
|
# |
|
4
|
# |
|
5
|
|
|
6
|
proc commit_id {version} { |
|
7
|
regexp -line {^artifact:\s+(\S+)} [fossil whatis $version] - id |
|
8
|
return $id |
|
9
|
} |
|
10
|
|
|
11
|
require_no_open_checkout |
|
12
|
|
|
13
|
################################################################# |
|
14
|
# Test 1 # |
|
15
|
# https://fossil-scm.org/forum/forumpost/549700437b # |
|
16
|
################################################################# |
|
17
|
|
|
18
|
test_setup |
|
19
|
|
|
20
|
write_file file1 "file1\n" |
|
21
|
fossil add file1 |
|
22
|
fossil commit -m "added file1" |
|
23
|
|
|
24
|
write_file file2 "file2\n" |
|
25
|
fossil add file2 |
|
26
|
fossil commit -m "added file2" --branch added |
|
27
|
|
|
28
|
write_file file2 "edit file2 on added\n" |
|
29
|
fossil commit -m "edited file2" |
|
30
|
|
|
31
|
fossil mv --hard file2 file2.renamed |
|
32
|
fossil commit -m "renamed file2" --branch renamed |
|
33
|
|
|
34
|
fossil branch new branched current |
|
35
|
|
|
36
|
write_file file2.renamed "edit file2.renamed on renamed\n" |
|
37
|
fossil commit -m "edited file2.renamed" |
|
38
|
|
|
39
|
fossil update trunk |
|
40
|
fossil merge renamed |
|
41
|
fossil commit -m "merged from renamed" |
|
42
|
|
|
43
|
write_file file2.renamed "edit file2.renamed on trunk (1)\n" |
|
44
|
fossil commit -m "edited file2.renamed on trunk (1)" |
|
45
|
|
|
46
|
fossil update branched |
|
47
|
fossil merge trunk |
|
48
|
test_status_list merge_renames_2-1.1 $RESULT {UPDATE file2.renamed} |
|
49
|
fossil commit -m "merged edit from trunk (1:this merge succeeded)" |
|
50
|
|
|
51
|
fossil update trunk |
|
52
|
write_file file2.renamed "edit2 file2.renamed on trunk (2)\n" |
|
53
|
fossil commit -m "edited file2.renamed on trunk (2)" |
|
54
|
|
|
55
|
fossil update branched |
|
56
|
fossil merge trunk |
|
57
|
test_status_list merge_renames_2-1.2 $RESULT {UPDATE file2.renamed} |
|
58
|
|
|
59
|
test_cleanup |
|
60
|
|