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

Re: Restriction on deletion of files from Subversion

From: Mat Schaffer <schapht_at_gmail.com>
Date: 2007-06-12 21:22:57 CEST

On Jun 12, 2007, at 3:10 PM, Mike Brenner wrote:
> So, a suggestion for a far distant change to subversion
> might be to isolate the MERGE process from the
> "current version" process, to allow multiple merges
> into a single version like this. Or perhaps to find
> some EXTERNAL TOOL to do the multiple merges and
> then just check in the final result after the last
> weekend warrior finishes their EXTERNAL TOOL merge?
> Does anyone know of such an EXTERNAL TOOL?

I've heard WinMerge is good. Xcode has FileMerge.app (under /
Developer/Applications/Utilities). Not sure on *nix, but the more
hardcore among us could probably get by with diff, patch and a text

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Jun 12 21:23:21 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.