---------- Forwarded message ----------
From: N D <niranjan8712_at_gmail.com>
Date: Thu, Sep 25, 2008 at 12:28 AM
Subject: Re: problem in svn switch on a text file
To: Ryan Schmidt <subversion-2008c_at_ryandesign.com>
I do not manually change the version.txt file. the only way it changes is
thru the build script that runs. but some times it get conflicted, i do no
understand when and how, and why only version.txt
yes, the number is present on the same line
On Wed, Sep 24, 2008 at 9:34 PM, Ryan Schmidt <
subversion-2008c_at_ryandesign.com> wrote:
>
> On Sep 24, 2008, at 10:59, N D wrote:
>
> 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_num0=======
>> 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?
>>
>
> A conflict occurred. You had locally changed version.txt, then switched to
> a branch where version.txt contained a different change on the exact same
> line where you had previously made a change. You must now resolve the
> conflict by editing version.txt and making the file look correct, for
> whatever your definition of correct is. Then run "svn resolved version.txt"
> to tell Subversion you have resolved the conflict.
>
> You can read about conflicts in the book:
>
> http://svnbook.red-bean.com/en/1.5/
> svn.tour.cycle.html#svn.tour.cycle.resolve
>
>
>
Received on 2008-09-25 00:29:19 CEST