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

Re: Add an svn:overwrite property on the local client

From: Simon Large <simon.tortoisesvn_at_googlemail.com>
Date: 2007-12-31 22:58:30 CET

On 31/12/2007, Bill Jasiulewicz <bill@progsys.net> wrote:
> 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.

It is your build process which needs to change. svn_revision.h should
not be versioned. It is a generated file, so it is rev.input.h which
should be versioned.

Simon

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Mon Dec 31 22:58:38 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.