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

Re: [PATCH] issue #2740: "out-of-date" error text varies depending on access method

From: Karl Fogel <kfogel_at_red-bean.com>
Date: 2007-10-25 09:03:33 CEST

Karl Fogel <kfogel@red-bean.com> writes:
> 2) The fact that ra_svn sends SVN_ERR_FS_TXN_OUT_OF_DATE, while
> every other RA layer sends SVN_ERR_FS_CONFLICT, when there's a
> conflict (this is due to historical reasons).

Although I didn't commit it in r27365, I thought of adding something
to the end of subversion/libsvn_client/commit.c:reconcile_errors() to
handle this case, maybe:

     if (err->apr_err == SVN_ERR_FS_CONFLICT
         || err->apr_err == SVN_ERR_FS_TXN_OUT_OF_DATE)
       {
         /* For historical reasons, an out-of-date error may look like
            either of these two error codes (the DAV-based RA layers
            drive their commits with a merge step before attempting to
            finalize the txn, whereas svn:// goes straight for the gold
            the first time). */
           SVN_ERR_W(err, _("Your working copy is out-of-date; try updating"));
           return err;
       }

Not sure it's worth it, but didn't want the idea to get lost.

-Karl

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Oct 25 09:03:43 2007

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