Hi Stefan, Philip,
I have created a unit test "move_new_folder_with_moved_file" to cover
this case. I added it to copy_tests.py at line 2210. When I run this
test it fails but with a different message which I think could also
indicate a bug. The message is svn: '/A/B2/new' is out of date.
Can you confirm this is a bug and that the unit test is correct?
Complete output of the test is added below.
Onno
myl-laptop ~/subversion_export3/subversion/tests/cmdline $ sudo
./copy_tests.py move_new_folder_with_moved_file
subversion/svn/commit-cmd.c:142: (apr_err=160028)
subversion/libsvn_client/commit.c:854: (apr_err=160028)
svn: Commit failed (details follow):
subversion/libsvn_client/commit_util.c:1713: (apr_err=160028)
subversion/libsvn_delta/path_driver.c:254: (apr_err=160028)
subversion/libsvn_client/commit_util.c:1488: (apr_err=160028)
subversion/libsvn_repos/commit.c:130: (apr_err=160028)
svn: '/A/B2/new' is out of date
Traceback (most recent call last):
File "/home/ostraaten/subversion_export3/subversion/tests/cmdline/svntest/main.py",
line 1162, in run
rc = self.pred.run(sandbox)
File "/home/ostraaten/subversion_export3/subversion/tests/cmdline/svntest/testcase.py",
line 170, in run
return self.func(sandbox)
File "./copy_tests.py", line 2270, in move_new_folder_with_moved_file
wc_dir)
File "/home/ostraaten/subversion_export3/subversion/tests/cmdline/svntest/actions.py",
line 1250, in run_and_verify_commit
*args)
File "/home/ostraaten/subversion_export3/subversion/tests/cmdline/svntest/main.py",
line 565, in run_svn
*(_with_auth(_with_config_dir(varargs))))
File "/home/ostraaten/subversion_export3/subversion/tests/cmdline/svntest/main.py",
line 315, in run_command
None, *varargs)
File "/home/ostraaten/subversion_export3/subversion/tests/cmdline/svntest/main.py",
line 498, in run_command_stdin
raise Failure
Failure
FAIL: copy_tests.py 43: move a new folder that contains a moved file
my-laptop ~/subversion_export3/subversion/tests/cmdline
On Thu, Jul 8, 2010 at 10:17 PM, Onno van der Straaten
<onno.van.der.straaten_at_gmail.com> wrote:
> Hi,
> A bit of a corner case but I thought I mention it anyway.
>
> If I move a new folder with a renamed file this causes an error message
>
> I'm stacking move operations, which is probably not wise but a result
> of the fact that I'm using a script with some logic to cleanup our
> repos.
> It looks like the following should reproduce it
> svn move A A2
> svn mkdir A2/new_folder
> svn move A2/file A2/new_folder/file
> svn move A2/new_folder/file A2/new_folder/file_new_name
> svn move A2/new_folder A2/new_folder_better_name
>
> the last move causes the message like
> svn: The node 'A2/new_folder/file' was not found.
>
> So it seems the wrong/old path was used. Somewhere administration was
> not correctly updated that the file moved to
> A2/new_folder/file_new_name?
>
> Some output with that message
> subversion/svn/move-cmd.c:102: (apr_err=155010)
> subversion/svn/util.c:901: (apr_err=155010)
> subversion/libsvn_client/copy.c:2347: (apr_err=155010)
> subversion/libsvn_client/copy.c:433: (apr_err=155010)
> subversion/libsvn_client/copy.c:433: (apr_err=155010)
> subversion/libsvn_client/copy.c:366: (apr_err=155010)
> subversion/libsvn_client/copy.c:342: (apr_err=155010)
> subversion/libsvn_wc/copy.c:734: (apr_err=155010)
> subversion/libsvn_wc/copy.c:484: (apr_err=155010)
> subversion/libsvn_wc/copy.c:269: (apr_err=155010)
> subversion/libsvn_wc/wc_db.c:2939: (apr_err=155010)
> subversion/libsvn_wc/wc_db.c:2857: (apr_err=155010)
> subversion/libsvn_wc/wc_db.c:5981: (apr_err=155010)
> subversion/libsvn_wc/wc_db.c:434: (apr_err=155010)
>
> svn status shows stuff has gone missing, I can see several exclamation marks.
>
> I'm using 1.7 dev build revision 961397.
>
> Reproduction script is attached.
>
> Looks like a bug?
>
> Onno
>
Received on 2010-07-12 10:10:27 CEST