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

Re: problem in svn switch on a text file

From: David Weintraub <qazwart_at_gmail.com>
Date: Wed, 24 Sep 2008 19:52:03 -0400

On Wed, Sep 24, 2008 at 6:28 PM, N D <niranjan8712_at_gmail.com> wrote:
> 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

When you run a private build, does that touch the version.txt file? It
might replace the version ID with the same number, but if it touches
the timestamp, I believe Subversion thinks the file was modified.

If you do a switch, and the file has not been changed or touched (that
is no timestamp change), Subversion should simply replace the file
with the version on the branch. Subversion will attempt a merge if it
believes the file has been touched.

Try doing a "svn status" before you do your "svn switch". See if
Subversion thinks the file was modified before you do the switch.

David Weintraub
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-09-25 01:52:21 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.