Re: Detecting merges

From: Kevin Puetz <puetzk_at_puetzk.org>
Date: 2005-06-17 07:37:29 CEST

There is also the script svnmerge at
http://svn.collab.net/viewcvs/svn/trunk/contrib/client-side/svnmerge, which
uses folder properties to store what has and hasn't been merged yet.

Kyle Kline wrote:

> SVK (http://svk.elixus.org/) does this almost exactly with its star-merge
> feature (svk smerge). SVK is command-line only though.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jun 17 07:39:25 2005

This message: [ Message body ]
Next message: Ed Hillmann: "Fwd: Error during repetative calls to cat"
Previous message: Ed Hillmann: "Fwd: Error during repetative calls to cat"
In reply to: Kyle Kline: "Re: Detecting merges"

Contemporary messages sorted: [ By Date ] [ By Thread ] [ By Subject ] [ By Author ] [ By messages with attachments ]