TortoiseSVN is showing you a diff in metadata properties on the two files, not in the file content itself. Right click on a file in Windows Explorer and choose "TortoiseSVN > Properties" (near the bottom of the submenu) to see what properties a given file has in svn. (Or do an "svn proplist filename" in a command prompt...)
The svn:keywords property is used with "$Id: blah-blah" keyword references in the file itself to do keyword substitution at commit time. HTH, David On Sun, Jun 7, 2009 at 3:22 PM, JOAQUIN M. LOPEZ MUÑOZ <joaq...@tid.es>wrote: > Hi, > > I'm no expert at the intricacies of SVN, so maybe I'm just doing > something really stupid, but here it goes: I'm using TortoiseSVN > for Windows. If I do a merge of some CMakeLists.txt from trunk to > branches/release (say, > /branches/release/libs/accumulators/CMakeLists.txt ), after the > merge TortoiseSVN indicates CMakeLists.txt has been updated > (little bang symbol overlayed on the file icon on Windows > explorer); however, if I initiate a commit and ask TortoiseSVN > to show me the differences between my local copy of > CMakeLists.txt and the one at the repository, the diff tool shows > no difference at all, even when the file is listed on the list > of files that have been changed! > > A final detail I guess might shed some light for experts: > when I double click for diffs as explained below, TortoiseSVN > does not only open a windows for CMakeLists.txt whosing that > there are no diffs, it also opens a separate diff window with the > strange captions for the remote and local panes: > > svn:keywords : Working Base > svn:keywords : Working Copy > > and here there *are* differences: Working Base is empty, > and Working Copy has the following single line: > > Id > > but I cannot figure out where this spurious additional > "svn:keywords" file is located and why a diff window > for it is opened if I double clicked on CMakeLists.txt. > > I've tried this with other CMakeLists.txt files and cmake-related > files to the same effect. > > If more info is needed please ask away. > > Thank you, > > Joaquín M López Muñoz > Telefónica, Investigación y Desarrollo > > _______________________________________________ > Boost-cmake mailing list > Boost-cmake@lists.boost.org > http://lists.boost.org/mailman/listinfo.cgi/boost-cmake > >
_______________________________________________ Boost-cmake mailing list Boost-cmake@lists.boost.org http://lists.boost.org/mailman/listinfo.cgi/boost-cmake
