[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: Simon Large <simon.tortoisesvn_at_googlemail.com>
Date: Fri, 1 Feb 2008 21:57:28 +0000

On 01/02/2008, Andy Levy <andy.levy_at_gmail.com> wrote:
> 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.

Not quite. Normally those would just show up as modified. A conflict
occurs when there is a difference between the working copy and the
working BASE (the state of the file as it exists in the repository
last time you updated), and also a difference between the working copy
and HEAD in the repository.

Normally that happens when more than one person is working on the same
file, so you do an update, work on the file and in the meantime
someone else has changed their copy of the file and committed a change
to the repository, so HEAD and your BASE no longer match.

In this case, the only scenario I can think of which would cause this
is that you used 'Update to revision' to update your WC to an older
revision and edited those older rev files. If you now try to update,
subversion has to try to merge the changes between HEAD and the
version you backdated to into your local changes, and as these are
binary files it can't do it.

Hope that makes sense,

Simon

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
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 22:57:35 CET

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