- Add a server/trunk/include/shared directory able to be referenced as an SVN
external resource in the client source tree.
- Move client/trunk/common/shared/newclient.h control to the newly added
include/shared directory in the server.
- Add a README file to the new shared directory with a brief note documenting
the new maintenance procedures for the newclient.h file.
645 lines of code changed in 3 files:
- After advice of Ragnor against svn:externals without -r, deleted the
svn:externals pointing to client/trunk/common/shared, after also coming to
the conclusion that this needs to be controlled in server vs. client so that
any client software base that wants to use this file can specify the version
of the file they want instead of the server having to pick one from
somewhere else.
9 lines of code changed in 1 file:
The file server/trunk/include/newclient.h was a separate copy of data from
client/trunk/common/newclient.h and was not kept in sync with the client.
Things were added either in client or server, but not both. The client
file was updated by merging all new content from the server file, and it
was then moved to client/trunk/common/shared/newclient.h so it would be
possible to set an svn:externals property in the server/trunk/include
directory that would cause a server/trunk/include/shared directory to be
created and populated as a mirror of client/trunk/common/shared. The
svn:externals property only works on directories. Now the file is truly
shared and changes in either area affect both builds. One conflict did
have to be resolved with #ifdef as a buf was declared differently in
the server than it was in the client.
29 lines of code changed in 11 files: