RE: Re: Restriction on deletion of files from Subversion

 beyond compare by scooter software is very nice (on windows)

-----Original Message-----
From: Mat Schaffer [mailto:schapht@gmail.com]
Sent: Wednesday, 13 June 2007 5:23 AM
To: users@subversion.tigris.org; Mike Brenner
Cc: Les Mikesell; Andy Levy; Thomas Harold; maitrayee.bhowmick@wipro.com
Subject: Re: Restriction on deletion of files from Subversion

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
editor.
-Mat

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

______________________________________________________________________
This email has been scanned by the MessageLabs Email Security System.
For more information please visit http://www.messagelabs.com/email
______________________________________________________________________

"This email is intended for the named recipient only. The information contained in this message may be confidential, or commercially sensitive. If you are not the intended recipient you must not reproduce or distribute any part of this email, disclose its contents to any other party, or take any action in reliance on it, or in reference to it. If you have received this email in error, would you please contact the sender immediately and delete/destroy all copies of this message, both electronic and otherwise. It is the recipient's duty to virus scan and otherwise test the enclosed information before using the information or loading attached files onto any computer system. Oasis Asset Management Ltd does not warrant that the information contained in this e-mail is free from viruses, defects, errors, interception or interference. Any views expressed in this message are those of the individual sender, except where that sender specifically states them to be the views of Oasis Asset Management Ltd."

______________________________________________________________________
This email has been scanned by the MessageLabs Email Security System.
For more information please visit http://www.messagelabs.com/email
______________________________________________________________________

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jun 13 08:03:36 2007