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

Re: svn commit: r35946 - trunk/subversion/tests/libsvn_fs

From: Greg Stein <gstein_at_gmail.com>
Date: Wed, 18 Feb 2009 03:44:49 +0100

Nit: please stop introducing whitespace before function calls' parens.

On Wed, Feb 18, 2009 at 03:00, C. Michael Pilato <cmpilato_at_collab.net> wrote:
> Author: cmpilato
> Date: Tue Feb 17 18:00:43 2009
> New Revision: 35946
>
> Log:
> Verify a particular promise of the svn_fs_commit_txn API (to set the
> new revision returned value to an invalid revision in the case of
> conflict).
>
> * subversion/tests/libsvn_fs/fs-test.c
> (test_commit_txn): Test that when a commit conflict occurs, the new
> revision returned is invalid.
>
> Modified:
> trunk/subversion/tests/libsvn_fs/fs-test.c
>
> Modified: trunk/subversion/tests/libsvn_fs/fs-test.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/tests/libsvn_fs/fs-test.c?pathrev=35946&r1=35945&r2=35946
> ==============================================================================
> --- trunk/subversion/tests/libsvn_fs/fs-test.c Tue Feb 17 17:50:12 2009 (r35945)
> +++ trunk/subversion/tests/libsvn_fs/fs-test.c Tue Feb 17 18:00:43 2009 (r35946)
> @@ -93,6 +93,15 @@ test_commit_txn(svn_revnum_t *new_rev,
> "commit conflicted at '%s', but expected conflict at '%s')",
> conflict, expected_conflict);
> }
> +
> + /* The svn_fs_commit_txn() API promises to set *NEW_REV to an
> + invalid revision number in the case of a conflict. */
> + if (SVN_IS_VALID_REVNUM(*new_rev))
> + {
> + return svn_error_createf
> + (SVN_ERR_FS_GENERAL, NULL,
> + "conflicting commit returned valid new revision");
> + }
> }
> else if (err) /* commit failed, but not due to conflict */
> {
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=495&dsMessageId=1182615
>

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1182863
Received on 2009-02-18 03:45:07 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.