[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [PATCH] Re: Issue #3354: copy operation during update fails

From: Stefan Sperling <stsp_at_elego.de>
Date: Sat, 17 Jan 2009 13:43:48 +0000

On Sat, Jan 17, 2009 at 03:40:57AM +0000, Stefan Sperling wrote:
> On Tue, Jan 13, 2009 at 08:45:36PM +0000, Stefan Sperling wrote:
> > I'm still hoping to get more eyes on trying to spot the real
> > bug though.
>
> Looks like the diff at the end of this mail fixes the problem
> properly.

> I did not commit yet because I got test failures that happened during
> make check, but which I could not reproduce by running the failing tests
> individually.

I ran make check again today and got 0 failures.
So I committed my diff in r35303.

We still need to fix update_test 52, so I'll leave issue #3354 open
to track the status of the test.

Stefan

> Paul, I also tried running your test with this diff, without the XFail.
> But I could not get the test to do anything useful. All it does is
> complain about the root node of the working copy, and I don't understand
> what's going on there:
>
> $ ./update_tests.py 52 2>&1
> =============================================================
> Expected '__SVN_ROOT_NODE' and actual '__SVN_ROOT_NODE' in output tree are different!
> =============================================================
> EXPECTED NODE TO BE:
> =============================================================
> * Node name: __SVN_ROOT_NODE
> Path: __SVN_ROOT_NODE
> Contents: N/A (node is a directory)
> Properties: {}
> Attributes: {}
> Children: 1
> =============================================================
> ACTUAL NODE FOUND:
> =============================================================
> * Node name: __SVN_ROOT_NODE
> Path: __SVN_ROOT_NODE
> Contents: None
> Properties: {}
> Attributes: {}
> Children: None (node is probably a file)
> Unequal Types: one Node is a file, the other is a directory
> Output of commit is unexpected
> EXPECTED OUTPUT TREE:
> ROOT
> +-- svn-test-work
> +-- working_copies
> +-- update_tests-52
> +-- A
> +-- B
> +-- E
> +-- alpha.moved
> ACTUAL OUTPUT TREE:
> ROOT
> ACTUAL OUTPUT TREE:
> svntest.wc.State('svn-test-work/working_copies/update_tests-52/', {
> })
> EXCEPTION: SVNTreeUnequal
> Traceback (most recent call last):
> File "/home/stsp/svn/svn-trunk/subversion/tests/cmdline/svntest/main.py", line 1310, in run
> rc = self.pred.run(**kw)
> File "/home/stsp/svn/svn-trunk/subversion/tests/cmdline/svntest/testcase.py", line 121, in run
> return self.func(sandbox)
> File "./update_tests.py", line 4205, in update_moves_and_modifies_an_edited_file
> wc_dir)
> File "/home/stsp/svn/svn-trunk/subversion/tests/cmdline/svntest/actions.py", line 1133, in run_and_verify_commit
> tree.compare_trees ("output", actual, output_tree)
> File "/home/stsp/svn/svn-trunk/subversion/tests/cmdline/svntest/tree.py", line 609, in compare_trees
> raise SVNTreeUnequal
> SVNTreeUnequal
> FAIL: update_tests.py 52: update moves and modifies a file with edits
>
> Note that the expected status is as shown above in the output
> of my reproduction script. Can you look into the test again
> and see if you can make it fail without the diff and pass with
> the diff? That would be great help! Thanks.
>
> Stefan
>
>
Received on 2009-01-17 14:44:17 CET

This is an archived mail posted to the Subversion Dev mailing list.