154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
|
set deletes [expr $deletes + 1]
}
}
if {$deletes!=0} {
# failed
protOut "Error, the merge should not delete any file"
test merge_renames-2 0
} else {
test merge_renames-2 1
}
######################################
# Test 4 #
# Reported: Ticket [67176c3aa4] #
######################################
|
|
|
|
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
|
set deletes [expr $deletes + 1]
}
}
if {$deletes!=0} {
# failed
protOut "Error, the merge should not delete any file"
test merge_renames-3 0
} else {
test merge_renames-3 1
}
######################################
# Test 4 #
# Reported: Ticket [67176c3aa4] #
######################################
|
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
|
fossil merge trunk
fossil commit -m "trunk merged, should have 3 files"
fossil ls
test merge_renames-5 {[normalize_result] eq {f1
f2
f3}}
######################################
#
# Tests for troubles not specifically linked with renames but that I'd like to
# write:
# [c26c63eb1b] - 'merge --backout' does not handle conflicts properly
# [953031915f] - Lack of warning when overwriting extra files
# [4df5f38f1e] - Troubles merging a file delete with a file change
|
|
|
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
|
fossil merge trunk
fossil commit -m "trunk merged, should have 3 files"
fossil ls
test merge_renames-5 {[normalize_result] eq {f1
f2
f3}} knownBug
######################################
#
# Tests for troubles not specifically linked with renames but that I'd like to
# write:
# [c26c63eb1b] - 'merge --backout' does not handle conflicts properly
# [953031915f] - Lack of warning when overwriting extra files
# [4df5f38f1e] - Troubles merging a file delete with a file change
|