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

SVN suggestion: addition of a manual merge operation

From: John Dubery <jdubery_at_ukonline.co.uk>
Date: 2005-01-26 22:34:47 CET

Hi,

A facility I've used in other version control systems and have missed on a couple of occasions in SVN is a "manual merge" (for want of a better term).

The SVN merge attempts to do as much as sensibly possible automatically, and require the user simply to resolve conflicts - good stuff.

In addition to this, I'd appreciate a "manual merge" that ...
* for files with no differences: leave unchanged as now
* for files with differences (even if trivial): behave as for "conflicted" files in the present merge operation

A anticipate that this would be easy to code - it's in effect a subset of the existing merge operation

Why - occasionally I have found a need to review all changes being merged in; one example of this is where there is an unexpected dependency between two sets of changes being merged into a trunk; another is an unexpected name clash.

cheers, and thanks for the music

John Dubery

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jan 28 06:35:52 2005

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