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

RE: merging a patch

From: Dale Worley <dworley_at_pingtel.com>
Date: 2005-05-03 15:38:49 CEST

> The relevant pieces of context are missing from above quotes, but the
> important difference is that the changes are coming from one
> repository and
> are merged into a different(!) repository.

What is odd about that? At my employer, there are two repositories, one
(maintained by the SIPfoundry open-source consortium) for the open-source
version of the software, and one (maintained by Pingtel Corp.) for the
commercial version. So we frequently carry changes from the open-source
repository (where most of the development happens) to the commercial
repository.

There's no reason is shouldn't work, "svn merge" is actually just a diff
between the first two versions, followed by a patch to apply the changes to
the third version. In a perfect world, Svn could do some hairy correlations
between all three versions to deduce things like "lines 273 through 279 of
file foo.c were changed between A and B, but in C that file has been renamed
bar.c, so that's the one to change". But it doesn't yet.

Dale

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue May 3 15:44:43 2005

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