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

Re: Update/Merge a working copy from a transaction

From: Ryan Schmidt <subversion-2006d_at_ryandesign.com>
Date: 2006-11-02 04:51:38 CET

On Nov 1, 2006, at 20:10, Sebastian Unger wrote:

> I am still interested in that svn patch command. Is there any way of
> actually applying a diff generated by svn diff or svnlook diff in
> the same
> way that an svn merge would have applied it? I think that would be
> a very
> useful feature. For example, I am quite commonly working with
> several working
> copies from the same repository location and occasionally I want to
> copy some
> changes from one WC to another without going through to the lengths
> of creating
> a branch and switching to it etc. svn diff | patch -d <otherWC>
> works fine as
> long as no files have been added/deleted or properties been
> modified. Then it
> fails.

The problem is not that the unix patch command doesn't know how to
interpret property changes, file additions/deletions etc... the
problem is that the text-based diff format used by the unix diff and
patch tools does not provide a means to express such things.

However, it looks like some work has been done on this problem:

http://subversion.tigris.org/issues/show_bug.cgi?id=511

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Nov 2 04:52:29 2006

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.