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

Patching your own work

From: Thomas Sturgeon <thomas.sturgeon_at_kineticsusa.com>
Date: 2005-03-18 19:40:27 CET

Greetings.

 

I understand how 2 users working on the same file would need to resolve
their changes at check-in time.

 

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.
Received on Fri Mar 18 19:40:09 2005

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