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

Re: how to artificially create local "Conflicted" state ?

From: Puneet Lakhina <puneet.lakhina_at_gmail.com>
Date: Tue, 29 Apr 2008 12:35:25 +0530

On Tue, Apr 29, 2008 at 11:59 AM, Yakov Lerner <iler.ml_at_gmail.com> wrote:

> How can I artificially create the local "Conflict" state on the working
> file,
> without doing any checkins on any computer ? Sort of opposite to
> 'svn resolved'. How ?
>

I dont think there is a direct way of doing it. This would involve some sort
of a hack by modifying .svn/entries file for this particular directory. In
conflicted state the entries file contains entries for
filename.rPREV
filename.rHEAD and
filename.mine

> The purpose is to prevent accidental checkin of temporary/debugging
> changes in the file. Attempt to checkin should cause svn error, just like
> attempt to checkin the file in Conflicted state is refused.
>

Are you looking for this:
http://subversion.tigris.org/faq.html#ignore-commit

>
> Thanks
> Yakov
>

-- 
Puneet
http://sahyog.blogspot.com/
Latest Post: javac -g
Received on 2008-04-29 09:05:53 CEST

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