[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: Patching your own work

From: Dale Worley <dworley_at_pingtel.com>
Date: 2005-03-18 23:11:49 CET

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

Received on Fri Mar 18 23:14:54 2005

This is an archived mail posted to the Subversion Users mailing list.