[cvsnt] Re: How to get back the local modified file after update?

Tony Hoyle tony.hoyle at march-hare.com
Sun Sep 18 17:29:17 BST 2005


Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to sales@march-hare.com.


Bo Berglund wrote:

> Now we have the problem that we want to reconstruct the original
> locally modified file (before the update) from the data available
> because this seems to be the one containing the correct solution.
> (Should have been committed....)
>
It's probably too late for you but the -3 option to update could help 
there, since it preserves all 3 files from the merge.  OTOH I'm not 
aware of any graphical diff programs that can examine such diffs.

Tony



More information about the cvsnt mailing list
Download the latest CVSNT, TortosieCVS, WinCVS etc. for Windows 8 etc.
@CVSNT on Twitter   CVSNT on Facebook