I'm attempting to merge a file back into the trunk. It doesn't seem to sense
all of my changes. For a test the following code checks out the trunk then
checks out a branch with changes. I do a diff of one of the files to
demonstrate that it is differnt in the branch from the trunk then I do a
merge --dry-run and all it shows me is the added files. It does not show
that it would have modified the .h file with changes. There are a number of
other files that have changed also, but for the sake of brevity, I haven't
documented that.
Any suggestions would be appreciated. I'm getting frustrated with subversion
and need a boost.
Thanks,
Jim.
[jlynch@linux ~]$ cd /tmp/test
[jlynch@linux test]$ rm -rf log4 logger [jlynch@linux test]$ svn checkout
svn+ssh://localhost/home/jlynch/svnrep/trunk logger
A log4/Readme
A log4/loggerbase.h
A log4/outputlog.cpp
A log4/outputlog.hpp
A log4/loggerbase.cpp
[removed a bunch of files]
A log4/README
A log4/header.h
Checked out revision 15.
[jlynch@linux test]$ svn checkout
svn+ssh://localhost/home/jlynch/svnrep/branches/log4
A log4/Readme
A log4/loggerbase.h
A log4/log4cplus.properties
A log4/errorlog.hpp
A log4/errorlog.cpp
A log4/outputlog.cpp
A log4/outputlog.hpp
A log4/loggerbase.cpp
[removed a bunch of files]
A log4/README
A log4/header.h
Checked out revision 15.
[jlynch@DevI01 test]$ diff log4/loggerbase.h logger/loggerbase.h
4d3
< //#include <windows.h>
72,73d70
< int diagLoopCount;
< int inputStageActiveCount;
138,139d134
< int openSocket;
< int closeSocket;
[jlynch@linux test]$ cd log4
[jlynch@linux log4]$ svn merge --dry-run
svn+ssh://localhost/home/jlynch/svnrep/trunk
svn+ssh://localhost/home/jlynch/svnrep/branches/log4
A log4cplus.properties
A errorlog.cpp
A errorlog.hpp
[jlynch@linux test]$
Received on Fri Oct 21 21:33:15 2005