Fossil

Check-in [1385c8d4]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Remove unnecessary first commit (that isn't actually a commit because I didn't call "fossil add" first...) in test 8.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | merge-renames
Files: files | file ages | folders
SHA1: 1385c8d456a4b2620d5a89faa6b5b8f0957e4670
User & Date: joel 2016-05-11 22:23:20
Context
2016-05-12
20:18
Remove unnecessary code. check-in: c8421e92 user: joel tags: merge-renames
2016-05-11
22:23
Remove unnecessary first commit (that isn't actually a commit because I didn't call "fossil add" first...) in test 8. check-in: 1385c8d4 user: joel tags: merge-renames
02:29
Ensure that N is also a first-parent ancestor of P for cases where P is not on the same branch as either V or M. check-in: 8bf221e5 user: joel tags: merge-renames
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to test/merge_renames.test.

249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
######################################################
#  Test 8                                            #
#  Merging two branches that both add the same file  #
######################################################

test_setup

write_file f1 "f1"
fossil commit -m "add f1"

fossil update trunk
write_file f2 "f2.1"
fossil add f2
fossil commit -b b1 -m "add f2"

fossil update trunk
write_file f2 "f2.2"
fossil add f2
fossil commit -b b2 -m "add f2"

fossil update trunk
fossil merge b1
fossil merge b2
test_status_list merge_renames-8-1 $RESULT {
  WARNING: no common ancestor for f2
}

fossil revert
fossil merge --integrate b1
fossil merge b2
test_status_list merge_renames-8-2 $RESULT {
  WARNING: no common ancestor for f2
}

#############################################
#  Test 9                                   #
#  Merging a delete/rename/add combination  #
#############################################








|
<
<
<
<
|
|


|
|
|





|






|







249
250
251
252
253
254
255
256




257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
######################################################
#  Test 8                                            #
#  Merging two branches that both add the same file  #
######################################################

test_setup

write_file f1 "f1.1"




fossil add f1
fossil commit -b b1 -m "add f1"

fossil update trunk
write_file f1 "f1.2"
fossil add f1
fossil commit -b b2 -m "add f1"

fossil update trunk
fossil merge b1
fossil merge b2
test_status_list merge_renames-8-1 $RESULT {
  WARNING: no common ancestor for f1
}

fossil revert
fossil merge --integrate b1
fossil merge b2
test_status_list merge_renames-8-2 $RESULT {
  WARNING: no common ancestor for f1
}

#############################################
#  Test 9                                   #
#  Merging a delete/rename/add combination  #
#############################################