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.
Tony, I'm trying to improve TortoiseCVS's conflict resolution. As CVSNT always makes a backup copy of the working file (e.g. .#foo.1.2), I'd like to use that file for conflict resolution (e.g. for options like "compare my merge result to my original working copy"). But as there may be multiple .#foo.* files, I don't know how to tell the backup file that CVSNT produced when creating the current conflict file (other than parsing the CVSNT output, but that's no persistent information). It would be great if you could integrate the name of the backup file (or the base revision number) in the conflict file. Currently the markers look like this: <<<<<<< foo ... ======= ... >>>>>>> 1.20 Maybe you could change CVSNT to produce something similar to: <<<<<<< .#foo.1.18 ... ======= ... >>>>>>> 1.20 Specifying the filename as part of the first conflict marker is redundant anyway, so CVSNT could use that place to somehow specify the base revision? -Hartmut