Re: Projected date for next version of SVN?

On May 19, 2007, at 12:41 AM, Nic Daniau wrote:

> Though merge tracking could be a nice feature if properly implemented,
> merges can be tracked with a little discipline, i.e. by keeping an
> up-to-date diagram of your merges and making sure merge operations are
> always committed in the same way with the following info:
> - Branch it was merged from
> - Revisions range
> - Revisions excluded in that range
> - Log of the merge, i.e. what you get when you do a merge --dry-run
> Though the first 3 are the most essential, the last one provides
> valuble
> info in case you need to come back to the merge.
>
> In any case I wouldn't regard the absence of built-in merge tracking a
> show stopper for not moving to Subversion...
>
> I quite like the fact that Subversion knows nothing of branches,
> merges
> etc, this is where most of the flexibility of the tool comes from.
> Adding merge tracking to the tool will have to be carefully
> designed so
> that the tool flexibility is not lost in the game.
>
> Nic

Nic,

See svnmerge.py that does most of this for you right now in any
Subversion release:

http://svn.collab.net/repos/svn/trunk/contrib/client-side/svnmerge/
http://www.orcaware.com/svn/wiki/Svnmerge.py

Regards,
Blair

-- 
Blair Zajac, Ph.D.
<blair@orcaware.com>
Subversion training, consulting and support
http://www.orcaware.com/svn/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org