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

Re: Re: Force commit?

From: Andy Levy <andy.levy_at_gmail.com>
Date: Fri, 1 Feb 2008 11:52:22 -0500

On Feb 1, 2008 11:49 AM, Menachem Bazian
<groups_at_bcconsultingservices.com> wrote:
> Beats the heck out of me. My guess is compiled code.
>
> These files are binary Visual FoxPro files which are tables. Some of the
> fields have the code and others have the compiled p-code. I am guessing the
> p-Code changed.
>
> But even so, I am the only one with write rights to this respository. I
> cannot imagine how I could have a conflict.

Because a "conflict" doesn't mean "someone else changed this", it
means "there's a difference between the WC and the repository which
Subversion can't merge itself." Since they're binaries, that's going
to happen almost every time.

> In any event, I resolved it (pun intended).
>
> ----- Original Message -----
> From: "Scott Pritchett" <scott.pritchett_at_amtrak.co.uk>
> To: <users_at_tortoisesvn.tigris.org>
>
> Sent: Friday, February 01, 2008 11:27 AM
> Subject: RE: Re: Force commit?
>
>
>
>
> -----Original Message-----
> From: Andy Levy [mailto:andy.levy_at_gmail.com]
> Sent: 01 February 2008 16:11
> To: users_at_tortoisesvn.tigris.org
> Subject: Re: Force commit?
>
>
> On Feb 1, 2008 10:47 AM, Menachem Bazian
> <groups_at_bcconsultingservices.com> wrote:
> >
> >
> > Hi,
> >
> > I am trying to commit some files to my repository and am getting conflict
> > error messages. Specifically:
> >
> > Error: Commit failed (details follow):
> > Error: Out of date: '/versions/VFP9/1.0/Project/libs/base.VCT' in
> > transaction '30-1'
> > Error: You have to update your working copy first.
> >
> > Now, I am not sure why this happened but I can tell you that I am the only
> > one who can write to this repository.
> >
> > In any event, I want to force a commit because the files on my machine
> > are,
> > by definition, the latest version right now.
> >
> > I am using the latest version of TSVN.
> >
> > Any ideas how I can accomplish this or if this is even possible?
>
> -Just do the update. When you commit, you WC isn't necessarily 100% up
> -to date, even if you're the only user.
>
>
> Just for interest, what 'could' have been changed?
>
> Scott
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
> For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
>
>
>
>
> --
> No virus found in this incoming message.
> Checked by AVG Free Edition.
> Version: 7.5.516 / Virus Database: 269.19.18/1255 - Release Date: 2/1/2008
> 9:59 AM
>
>
>
> ---------------------------------------------------------------------
>
> To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
> For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-02-01 17:52:28 CET

This is an archived mail posted to the TortoiseSVN Users mailing list.