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

RE: Re: Locking Working Copy File

From: Gleason, Todd <tgleason_at_impac.com>
Date: Thu, 27 Mar 2008 06:50:35 -0700

That's only a temporary solution though. If you want it to survive
subsequent updates I think you really have to change the file in the
repository. You could reverse-merge the file and commit it, and later
merge back the previous changes to put them back in.

If it's not the entire file that is the problem, but just a certain set
of changes, then reverse-merge the file to undo the undesirable changes,
and leave it in your working copy uncommitted. I believe that
subsequent updates will not change the section of reverse-merged code
(you would get a conflict if that were the case, and you could choose to
ignore any conflict resolution if needed). Then, when the time is
right, you could actually update to the newest revision.

I guess another alternative would be to create a private branch and use
reverse-merging to wipe out the undesired revision, and just keep
merging newer changes to your private branch, but it would be more work
to maintain that.

-----Original Message-----
From: mradev_at_gmail.com [mailto:mradev_at_gmail.com] On Behalf Of Milen A.
Radev
Sent: Thursday, March 27, 2008 7:44 AM
To: users_at_tortoisesvn.tigris.org
Subject: Re: Locking Working Copy File

On 27/03/2008, Maze, Jeffrey S. <JMaze_at_co.geauga.oh.us> wrote:
> Hello,
> I was wondering if there's a way to lock a working copy to a
> certain revision. So if the file is changed within the repository
and I
> update the working copy on my PC, the file will not be updated.

Update the file to a specified revision using "Update to revision..."
submenu and choose "Only this item" in the dialogue. That's for
version 1.5 beta1.

-- 
Milen A. Radev
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-03-27 14:52:17 CET

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