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

[PATCH] Merge source and target must be related but different branches, v1

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Wed, 14 Dec 2011 13:18:34 +0000 (GMT)

Here's a patch to reject silly merge attempts, which up to now give silly results. This does not apply to all merges (general 2-URL and cherry-pick merges), but the commonly used 'sync' and 'reintegrate' forms of merge only make sense when the source and target 'branches' are related (have a common ancestor) and are not the same. This patch applies such checks to the 'reintegrate' merge, simple 'sync' merge, and the 'svn mergeinfo' command. A few tests currently fail with this patch -- tests that use the special "svn merge FILE[@REV]" syntax.  I'm currently investigating this and learning what it's supposed to be doing. Comments? - Julian

Received on 2011-12-14 14:19:13 CET

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