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

Re: Tree conflict bugs I've just been finding

From: Neels J. Hofmeyr <neels_at_elego.de>
Date: Fri, 14 Nov 2008 01:45:35 +0100

I'd like to add this one:
Running tree_conflicts.py 9, the output should be a conflict error on
commit, but it's a "not under version control" error.

[[[
--- Trying to commit (expecting 'conflict' error)
CMD: svn ci -m "log msg" branch2/ft/F --config-dir
/arch/elego/svn/trunk/subversion/tests/cmdline/svn-test-work/local_tmp/config
--password rayjandom --no-auth-cache --username jrandom CMD:
/arch/elego/svn/trunk/subversion/svn/svn ci -m "log msg" branch2/ft/F
--config-dir
/arch/elego/svn/trunk/subversion/tests/cmdline/svn-test-work/local_tmp/config
--password rayjandom --no-auth-cache --username jrandom exited with 1
<TIME = 0.016757>
subversion/libsvn_client/commit.c:860: (apr_err=150000)
svn: Commit failed (details follow):
subversion/libsvn_client/commit_util.c:791: (apr_err=150000)
svn:
'/arch/elego/svn/trunk/subversion/tests/cmdline/svn-test-work/working_copies/tree_conflict_tests-9/branch2/ft/F'
is not under version control
]]]

~Neels

Julian Foad wrote:
> Bug: "resolved" complains if the target's parent isn't a WC:
> [[[
> $ svn resolved wc2
> svn: warning: '.' is not a working copy
>
> $ svn st wc2
> M C wc2/foo
> ]]]
>
> Bug (minor):
> [[[
> $ svn resolved nonexistent
> # no error
> ]]]
>
> Bug: "update" hasn't actually updated to the revision it says it has,
> and so marking as resolved doesn't complete the update:
> [[[
> $ svn up
> C foo
> At revision 2.
> Summary of conflicts:
> Tree conflicts: 1
>
> $ svn up
> Skipped 'foo'
> At revision 2.
> Summary of conflicts:
> Skipped paths: 1
>
> $ svn st
> M C foo
>
> $ svn resolved foo
> Resolved conflicted state of 'foo'
>
> $ svn up
> C foo
> At revision 2.
> Summary of conflicts:
> Tree conflicts: 1
> ]]]
>
> - Julian
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
> For additional commands, e-mail: dev-help_at_subversion.tigris.org
>

Received on 2008-11-14 01:45:58 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.