Re: CVS diff after a rename
"Arthur Barrett" <arthur.barrett-qn/[email protected]> Sun, 25 Apr 2010 07:51:27 +1100
| Newsgroups | gmane.comp.version-control.cvs.tortoisecvs.user |
|---|---|
| Message-ID | <[email protected]> |
Hi Torsten/Jacob, This can be cause by either TortoiseCVS or by CVSNT Server. Performing 'checkout' on a renamed file is a very tricky operation - and each version of CVSNT Server does it quite differently - the difficulty is finding the correct name of the file for the given circumstances of the checkout - Tony rarely checks out individual files - so the logic works when you checkout a directory - but individual files often have weird errors. eg: some versions require that the 'original' name always be used, other versions will get the name right/except sometimes... Therefore it is very important to include the CVSNT Server version number with any error report for rename. I think I have also seen this caused by TortoiseCVS on older builds - though I haven't tried to test it on the recent 1.12.x. In this case if I rename a file then fire up revision graph and then choose a revision 'before' the rename - TortoiseCVS doesn't use the previous name of the file to 'checkout' the old revision - so it cannot be found. Or if I checkout a 'branch' (that uses the old name of the file) and try do diff the 'HEAD' (where it is renamed) then TortoiseCVS doesn't use the 'new' name of the file. I've often wondered if there is a more 'efficient' way to do a side-by-side diff than checking out two complete revisions. eg: copy the existing sandbox file, perform a 'cvs diff' and then running 'patch' to create the second file (would only work for text files)- or copy the existing sandbox, perform a 'cvs up -r' (would work for text and binary files - and the protocol would use a 'diff' patch algorithm). Regards, Arthur -----Original Message----- From: Torsten Martinsen [mailto:[email protected]] Sent: Saturday, 24 April 2010 6:41 AM To: Jacob Page Cc: tortoisecvs-users-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org Subject: Re: [TortoiseCVS] CVS diff after a rename Jacob Page wrote: In TortoiseCVS, version 1.10.10, I went ahead and renamed a file, despite the warning I was presented. Now, whenever I attempt a diff through TortoiseCVS, I get an error from the CVS server, saying "cannot find module 'blah/blah/blah' - ignored." The "blahs" in the path correctly reflect my directory and file names. Strangely, I can do a cvs diff from the command line, and everything works fine. Is there any way I can restore diffability for my renamed files? Please describe the exact command that TortoiseCVS runs, and the command that you run yourself. -Torsten ------------------------------------------------------------------------------ _______________________________________________ tortoisecvs-users mailing list tortoisecvs-users-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org https://lists.sourceforge.net/lists/listinfo/tortoisecvs-users