RE: Can't save merged file when using Tortoise CVS with WinMerge

[Jim.Hyslop]

address@hidden wrote:
> I have come across a problem where after merging my conflicting file
> with WinMerge if there were any changes on the left hand side of the
> comparison view WinMerge will ask me to save under a different name
> because the file is set as read only by TortoiseCVS.
> 
> Can tortoise CVS be told to not make the temporary file (on the left
> of comparison view) not read only?
I don't know. You would probably get better information from a list that
specializes in Tortoise and/or CVSNT - this list specializes in the CVS
implementation available from cvshome.org

> I saw one site 
> http://lcgcvs.web.cern.ch/lcgcvs/howto.html#accessing-winmerge
> where there work around is "Remember that the file on the left in
> WinMerge is just a temporary copy of the file in CVS. Modify the file
> on the right, save it and then commit the changes using WinCVS."

I'm not familiar with Tortoise, but that advice seems to me to be extremely
sensible. I wouldn't even view it as a "work around" - a workaround is a
series of steps you have to do, to bypass some bug in the program. Their
suggestion is, in my opinion, a very good Recommended Practise.

-- 
Jim Hyslop
Senior Software Designer
Leitch Technology International Inc. (http://www.leitch.com)
Columnist, C/C++ Users Journal (http://www.cuj.com/experts)