[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: Yakov Lerner <iler.ml_at_gmail.com>
Date: Tue, 29 Apr 2008 09:20:16 +0200

On Tue, Apr 29, 2008 at 9:05 AM, Puneet Lakhina
<puneet.lakhina_at_gmail.com> wrote:
> 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

I am sure 'ignore-commit' trick is suitable for certain users.

For me, it is not suitable for me at all: The file in question is
under VC, and it is not an option to remove it from VC.

In Linux/Unix, I do have a solution for protecting from accidental checkin --
I make local file to a become symlink -- then 'svn ci' dies with
"Special state changed" error.
That's nice trick.

But On Windows .. on windows I am still searching for the solution.

The hacking the .svn/entries you mentioned looks promising, I'll investigate it.


To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-04-29 09:20:48 CEST

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