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

Re: Changesets in SVN - help needed!

From: Peter Valdemar Mørch <swp5jhu02_at_sneakemail.com>
Date: 2004-09-03 23:27:55 CEST

Pawel Dembski paweld-at-kompakt.pl |Lists| wrote:
> svn diff >mypatch
<snip>
> Cannot display: file marked as a binary type.

Yes, I share your need. What is needed is a tool that will generate
binary diffs and be able to patch with them.

What I do is to use tla (Tom Lord's Arch).

When I need to generate a patch between versions rA and rB of the
published svn archive, I check out a working copy of each of the two
versions rA and rB. From each, I delete all the .svn directories with:

find . -name .svn | xargs rm -rf

I then use
tla changeset
to generate the change set, and
tla apply-changeset
to apply it to a working copy of my own vendor-branch.

Its ugly but it works. Does anybody else have a better/easier/faster way
to do it, when changes could be binary too?

(Its kind of ironic, that tla should come to my rescue... :-D)

My need is for cross-repository merges, that aren't yet supported by
Subversion. But wow, I just found svk and SVN::Mirror to mirror
repositories:
http://search.cpan.org/~clkao/SVN-Mirror-0.42/lib/SVN/Mirror.pm
http://svk.elixus.org/
Cool! I'll give them a wirl, to see if they handles binary diffs too!
But that may not help Mr. Dembski who is looking for changeset support...

Peter

-- 
Peter Valdemar Mørch
http://www.morch.com
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Sep 3 23:28:28 2004

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