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

problem in svn switch on a text file

From: N D <niranjan8712_at_gmail.com>
Date: Wed, 24 Sep 2008 17:59:21 +0200

In my code I have a txt file where i store a version number. This file is
called version.txt

Now if my working copy is from TRUNK, and I switch it to some branch, all
the stuff from the branch is taken into the working copy

properly, with proper message alphabets D, A, U etc. But for the version.txt
file, I get a C, C = Conflict. The file in my working copy is contaminated
something like:

<<<<<<< .mine
rev_num1>>>>>>> .r<rev_num1>

and files by the name version.txt.2.r<rev_num1>, version.txt.mine,
version.txt.r<rev_num1> are created in the directory. FRom the testing so
far, such files will not allow me to commit the working copy into svn.

But the above problem does not happen frequently. IT happens sometimes. Has
this anything to do with SVN treating text files as binary files?

Can anyone please help/comment?
Received on 2008-09-24 17:59:46 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.