1532
1532
### commit to behave differently from other commands taking -N.
1534
1534
### These days, -N should be equivalent to --depth=files in almost
1535
### all cases. There are some exceptions (e.g., status), but commit
1536
### is not an exception. Thus, the above recipe is now incorrect,
1537
### because "wc/dirA/dirB" was given as an explicit target, and
1538
### therefore the file "wc/dirA/dirB/nocommit" *should* have been
1539
### committed after all, since it's a file child of a named target
1540
### and -N means --depth=files.
1542
### So we really need two tests: one for commit -N (--depth=files),
1543
### and another for --depth=empty. I've changed this test to cover
1544
### the -N case, and added 'commit_propmods_with_depth_empty' to
1545
### depth_tests.py to cover the --depth=empty case.
1535
### all cases. There are some exceptions (e.g., status), and commit
1536
### is one of them: 'commit -N' means 'commit --depth=empty'.
1538
### The original implementation, as well as this test, mistakenly
1539
### mapped 'commit -N' to 'commit --depth=files'; that was a bug that
1540
### made 'svn ci -N' incompatible with 1.4 and earlier versions.
1542
### See also 'commit_propmods_with_depth_empty' in depth_tests.py .
1547
1544
# Now add these directories and files, except the last:
1548
1545
dirA_path = 'dirA'
1563
1560
# Add them to version control.
1564
1561
svntest.actions.run_and_verify_svn(None, svntest.verify.AnyOutput, [],
1565
'add', '--depth=empty',
1566
1563
os.path.join(wc_dir, dirA_path),
1567
1564
os.path.join(wc_dir, fileA_path),
1568
os.path.join(wc_dir, fileB_path),
1569
1566
os.path.join(wc_dir, dirB_path),
1570
1567
os.path.join(wc_dir, nope_1_path),
1571
os.path.join(wc_dir, nope_2_path))
1573
1571
expected_output = svntest.wc.State(
1575
1573
{ dirA_path : Item(verb='Adding'),
1576
fileA_path : Item(verb='Adding'),
1577
fileB_path : Item(verb='Adding'),
1593
1590
# Expect some commits and some non-commits from this part of the test.
1594
1591
expected_status.add({
1595
1592
dirA_path : Item(status=' ', wc_rev=3),
1596
fileA_path : Item(status=' ', wc_rev=3),
1597
fileB_path : Item(status=' ', wc_rev=3),
1593
fileA_path : Item(status='A ', wc_rev=0),
1598
1595
dirB_path : Item(status='A ', wc_rev=0),
1599
1596
nope_1_path : Item(status='A ', wc_rev=0),
1600
nope_2_path : Item(status='A ', wc_rev=0)
1603
1600
svntest.actions.run_and_verify_commit(wc_dir,