RE: applying a merge on a non workingcopy

-----Original Message-----
From: Ulrich Eckhardt [mailto:eckhardt@satorlaser.com]

The thing I need is to provide some libraries to my fellow developers here,
possibly with changes that have not (yet) been merged upstream. If there's an
easier way to track external sources and still preserve local changes I'm all
open ears.
---------------------------------------------------------------------

You've already mentioned the solution that works well, maintaining a "vendor branch" structure. With any other method, you don't keep a full record of the various different versions of the libraries.

-----Original Message-----
From: Ulrich Eckhardt [mailto:eckhardt@satorlaser.com]

However, I don't like the way it is described in chapter 7 of The
Book: I don't have a copy of the external sources in any of my own projects,
so there is no URL I could use to tell 'svn merge' what changes to
incorporate when dropping a new vendor release.
---------------------------------------------------------------------

Dale

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Dec 10 17:34:57 2004