| commit | 3aebc79e5bfc3d47850a47280c409e5959f15eaf | |
| author | Julian Foad <julian.foad@wandisco.com> | |
| Tue, 9 Dec 2008 13:26:20 +0000 (9 13:26 +0000) | ||
| committer | Julian Foad <julian.foad@wandisco.com> | |
| Tue, 9 Dec 2008 13:26:20 +0000 (9 13:26 +0000) | ||
| tree | dbe3e2eaac1c0a2eeb0396a50f811c76c5df8a84 | treesnapshot (tar.gz zip) |
| parent | 00cc7fa397dbbb39eff5740ec3c1cc6b5986ba26 | commitdiff |
Include property changes in the deep trees conflict tests. This doesn't
by itself make for better testing of conflict detection, because the prop
changes and the other changes are on the same nodes. The purpose is to
move towards being able to check that the changes are preserved when the
conflict is resolved.
* subversion/tests/cmdline/svntest/actions.py
(deep_trees_leaf_edit): Make property changes as well as other changes.
(deep_trees_status_local_leaf_edit): Expect property changes.
git-svn-id: http://svn.apache.org/repos/asf/subversion/trunk/subversion/tests/cmdline@874695 13f79535-47bb-0310-9956-ffa450edef68
by itself make for better testing of conflict detection, because the prop
changes and the other changes are on the same nodes. The purpose is to
move towards being able to check that the changes are preserved when the
conflict is resolved.
* subversion/tests/cmdline/svntest/actions.py
(deep_trees_leaf_edit): Make property changes as well as other changes.
(deep_trees_status_local_leaf_edit): Expect property changes.
git-svn-id: http://svn.apache.org/repos/asf/subversion/trunk/subversion/tests/cmdline@874695 13f79535-47bb-0310-9956-ffa450edef68
| svntest/actions.py | diffblobblamehistory |