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

Re: Update modifications

From: Ryan Schmidt <subversion-2007b_at_ryandesign.com>
Date: 2007-11-19 23:03:31 CET

On Nov 19, 2007, at 05:24, Danny De Koster wrote:

> One directory contains for example /usr/source/p_art.4gl
> In my second directory I have the same p_art.4gl but with some
> modifications for a customer.
> Now I would like that when p_art.4gl changes in my first directory,
> the same changes could be updated en still keep the changes for the
> customer.
> Which procedure can I follow with Subversion?

You're looking for "merge". That is, if this is a text file. If it's
a binary file, Subversion cannot merge it for you; you'll have to do
it by hand.

The Branching and Merging section of the book is relevant reading,
perhaps in particular this section on Copying Specific Changes:


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Nov 19 23:04:29 2007

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.