1396
1396
None, None, None,
1397
1397
wc_dir, '--accept', 'mine-conflict')
1400
def move_del_moved(sbox):
1401
"delete moved node, still a move"
1403
wc_dir = sbox.wc_dir
1405
sbox.simple_mkdir('A/NEW')
1406
sbox.simple_move('A/mu', 'A/NEW/mu')
1407
sbox.simple_rm('A/NEW/mu')
1409
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
1410
expected_status.tweak('A/mu', status='D ')
1411
expected_status.add({
1412
'A/NEW' : Item(status='A ', wc_rev='-')
1415
# A/mu still reports that it is moved to A/NEW/mu, while it is already
1417
svntest.actions.run_and_verify_status(wc_dir, expected_status)
1419
def copy_move_commit(sbox):
1420
"copy, move and commit"
1423
wc_dir = sbox.wc_dir
1426
# - Create folder aaa
1427
# - Add file bbb.sql
1428
# create table bbb (Id int not null)
1431
# - Copy folder aaa under same parent folder (i.e. as a sibling). (using Ctrl drag/drop).
1432
# Creates Copy of aaa
1433
# - Rename Copy of aaa to eee
1435
# Get error need to update
1438
# Get error need to update
1440
sbox.simple_copy('A/D/G', 'A/D/GG')
1441
sbox.simple_move('A/D/GG', 'A/D/GG-moved')
1442
sbox.simple_commit('A/D/GG-moved')
1400
1445
def move_to_from_external(sbox):
1401
1446
"move to and from an external"