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

Re: SVN suggestion: addition of a manual merge operation

From: Tom Mornini <tmornini_at_infomania.com>
Date: 2005-01-28 09:27:35 CET

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On Jan 26, 2005, at 1:34 PM, John Dubery wrote:

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

I don't think I understand you, John.

Why not execute the merge to your WC, then run 'svn status', then
inspect the merges before committing?

- --
- -- Tom Mornini

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (Darwin)

iD8DBQFB+fd3zaKkuvKwKvcRAuyjAJ9XDgvDTU6M3MjAudluzGNzQoK5swCfRjnn
1xnkDVvQMSJJkAVoZqCGj9w=
=WPjN
-----END PGP SIGNATURE-----

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jan 28 09:31:55 2005

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