RE: Patching your own work

From: Thomas Sturgeon [mailto:thomas.sturgeon@kineticsusa.com]

However, I do not understand how to do it if only one person is working with
the repository; the vendor is sending out patches at the same time I am
making changes.

I need to resolve the differences and create a new version. Diff'ing the
files won't work...it needs to create the comparisons that I can use to
resolve the differences.

It sounds like you need a "vendor branch", which is discussed in the
Subversion book.

Dale

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org