Guten Tag dov.kru...@americas.bnpparibas.com,
am Montag, 25. April 2011 um 17:08 schrieben Sie:
> Take it as fact that I'm not interested in my version of the file. So
> anything svn may have decided about resolving collisions is irrelevant.
Subversion can't know that until you tell it to know,
onger exists.
However, to clarify for everyone, we are using svn 1.6.15, which is pretty
recent under linux.
my SVN_EDITOR is emacs.
Internet
subversion-20...@ryandesign.com
04/25/2011 10:43 AM
To
Dov KRUGER
cc
users@subversion.apache.org
Subject
Re: trying to get new version of files fro
Ryan Schmidt wrote on Mon, Apr 25, 2011 at 09:43:03 -0500:
>
> On Apr 25, 2011, at 09:34, dov.kru...@americas.bnpparibas.com wrote:
>
> > Subversion just reports the current version number and does not try to
> > bring the files in as cvs would.
>
> This should indeed have brought back the cur
On Apr 25, 2011, at 09:43, Ryan Schmidt wrote:
>> I tried to update, to get the new files, and to get his updated version.
>>
>> It reported the files changed, just as I would see in cvs:
>>
>> CA.txt
>
> Ok, a conflict occurred
In fact, the current version of Subversion would have ask
On Apr 25, 2011, at 09:34, dov.kru...@americas.bnpparibas.com wrote:
> Excuse my ignorance, I'm used to cvs.
I have never used cvs, so my advice may not exactly correspond.
> I edited some files at the same time as a colleague, but when we realized, he
> went forward, so my copies were obsole
Is your .svn directory available or that too is deleted ?
which version of svn are you using ?
Prabhu
On Monday 25 April 2011 08:04 PM, dov.kru...@americas.bnpparibas.com wrote:
Excuse my ignorance, I'm used to cvs.
I edited some files at the same time as a colleague, but when we
realized,
Excuse my ignorance, I'm used to cvs.
I edited some files at the same time as a colleague, but when we realized,
he went forward, so my copies were obsolete.
Some time later, I tried to update, to get the new files, and to get his
updated version.
It reported the files changed, just as I would s
