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.
I ran into the following problem recently: - A file in a sandbox contained a number of local edits - It had not been committed for some time... - Another user committed a lot of changes to this file - On update a conflict was created 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....) Is there any way using cvs commands or diffing to recreate the file contents before the update and merge? /Bo (Bo Berglund, developer in Sweden)