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

Re: Merging unrelated branches - release notes

From: C. Michael Pilato <cmpilato_at_collab.net>
Date: Thu, 20 Jun 2013 10:53:45 -0400

On 06/20/2013 09:24 AM, Johan Corveleyn wrote:
> I think this is an important change (improvement) that deserves
> mention in the release notes, rather than being burried in the huge
> CHANGES list. WANdisco even put it in their announcement mail
> "WANdisco offers Apache Subversion 1.8" (as one of five items they
> considered important enough to mention explicitly).
>
> Just my 0.02 €

Let's evaluate the change on its own merits, please, not on the basis of
some company's marketing fluff. It's not uncommon in press releases to see
even the littlest things billed as more world-changing than they really are,
and I daresay WANdisco's Marketing folks aren't unique in this respect.

I agree that the feature is a good one to highlight. Top 5 in the release?
 Puh-lease. But it certainly deserves a release note mention, if only
because it's a behavior change that someone might be counting on continuing
to work. Maybe they created a branch in the past as a parallel import
instead of via the 'svn copy' construct, and have been merging just fine
between that branch and another -- in 1.7, that seems to have worked fine:

{{{
$ svn export A Z
A Z/B
A Z/B/lambda
A Z/B/E
[...]
A Z/D/H/chi
A Z/D/H/omega
A Z/D/H/psi
Export complete.
$ svn add Z
A Z
A Z/mu
A Z/B
[...]
A Z/D/H/chi
A Z/D/H/omega
A Z/D/H/psi
$ svn ci -m ""
Adding Z
Adding Z/B
Adding Z/B/E
[...]
Adding Z/D/H/psi
Adding Z/D/gamma
Adding Z/mu
Transmitting file data ...........
Committed revision 2.
$ echo "foo" >> A/mu
$ svn ci -m ""
Sending A/mu
Transmitting file data .
Committed revision 3.
$ svn merge ^/A Z
--- Merging r2 through r3 into 'Z':
U Z/mu
--- Recording mergeinfo for merge of r2 through r3 into 'Z':
 U Z
$ svn diff
Index: Z
===================================================================
--- Z (revision 1)
+++ Z (working copy)

Property changes on: Z
___________________________________________________________________
Added: svn:mergeinfo
   Merged /A:r2-3
Index: Z/mu
===================================================================
--- Z/mu (revision 2)
+++ Z/mu (working copy)
@@ -1 +1,2 @@
 This is the file 'mu'.
+foo
$
}}}

-- 
C. Michael Pilato <cmpilato_at_collab.net>
CollabNet   <>   www.collab.net   <>   Enterprise Cloud Development

Received on 2013-06-20 16:54:23 CEST

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