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

Add an svn:overwrite property on the local client

From: Bill Jasiulewicz <bill_at_progsys.net>
Date: 2007-12-31 22:12:08 CET

I am using this command to update a file svn_revision.h

"C:\Program Files\TortoiseSVN\bin\subwcrev.exe" ".\AHBot" ".\rev.input.h"
"AHBot\src\shared\svn_revision.h"

However, every time I update the SVN, I get an error that the file is
Conflicted.

If I could and an svn:overwrite property to that specific file, I could tell
Tortoise to just always overwrite this file when updated and always avoid
the conflicts that have to be manually resolved.

Text of rev.input.h

// $Id: svn_revision.h $WCNOW$ debug $

#ifndef _SVN_REVISION_H
#define _SVN_REVISION_H

//////////////////////////////////////////////////////////

static const char * REVISION_TEXT = "$Rev: $WCREV$ $";
static const char * BUILD_TAG = "2.8-TRUNK";

//////////////////////////////////////////////////////////

ASCENT_INLINE int g_getRevision()
{
        const char* p = REVISION_TEXT + 6;
        return atoi( p );
}

//////////////////////////////////////////////////////////

#endif

Text of svn_revision.h

// $Id: svn_revision.h 2801 2007-12-31 19:18:52Z debug $

#ifndef _SVN_REVISION_H
#define _SVN_REVISION_H

//////////////////////////////////////////////////////////

static const char * REVISION_TEXT = "$Rev: 2801 $";
static const char * BUILD_TAG = "2.8-TRUNK";

//////////////////////////////////////////////////////////

ASCENT_INLINE int g_getRevision()
{
        const char* p = REVISION_TEXT + 6;
        return atoi( p );
}

//////////////////////////////////////////////////////////

#endif
Received on Mon Dec 31 22:26:07 2007

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

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