| commit | 20f16d80770c57d66441f777cfa879e6bf2d0d06 | |
| author | glasser <glasser@612f8ebc-c883-4be0-9ee0-a4e9ef946e3a> | |
| Mon, 3 Mar 2008 20:16:25 +0000 (3 20:16 +0000) | ||
| committer | glasser <glasser@612f8ebc-c883-4be0-9ee0-a4e9ef946e3a> | |
| Mon, 3 Mar 2008 20:16:25 +0000 (3 20:16 +0000) | ||
| tree | 0a66d3bd695d760b66a0789fbed0af2cbba21ce0 | treesnapshot (tar.gz zip) |
| parent | 2e1ec4087ab6b8a2d315832ed9b2cd0de504e020 | commitdiff |
Extract the non-renaming part from reintegrate_with_rename as
basic_reintegrate, which actually does pass.
* subversion/tests/cmdline/merge_tests.py
(basic_reintegrate): New.
(test_list): Adjust.
git-svn-id: http://svn.collab.net/repos/svn/trunk@29680 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
basic_reintegrate, which actually does pass.
* subversion/tests/cmdline/merge_tests.py
(basic_reintegrate): New.
(test_list): Adjust.
git-svn-id: http://svn.collab.net/repos/svn/trunk@29680 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
| subversion/tests/cmdline/merge_tests.py | diffblobblamehistory |