[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: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2005-05-03 15:52:21 CEST

On May 3, 2005, at 8:38 AM, Dale Worley wrote:
>
> 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.

'svn merge' isn't "just a diff", it's quite sensitive to history
("ancestry"). Read about it here:

    http://svnbook.red-bean.com/en/1.1/ch04s03.html#svn-ch-4-sect-3.3.4

So when the merge command wants to add a file, it doesn't just schedule
it for addition; it schedules it as a *copy*, i.e.
addition-with-history. If the history comes from a completely
different repository, everything breaks.

That's not to say that it's not a long-term goal for repositories to
somehow share history... it's just not possible right now. If you want
to move changes from one repository to another, you'll need to resort
to plain old 'svn diff > patchfile' and then use GNU patch. (Which
stinks, since that doesn't deal with properties, or directory
adds/deletes, etc.) This is also a good reason for us to get off our
duffs and implement a custom svn-patch-format.

---------------------------------------------------------------------
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:54:26 2005

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