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

Getting merge tracking in 1.5 working

From: <david.x.grierson_at_jpmorgan.com>
Date: Fri, 25 Apr 2008 11:03:23 +0100

Hi,

I just downloaded SVN 1.5.0-rc4 to see if it would compile on our systems
and take a poke around at some of the features in it.

I've noticed some "funnies" to do with the big merge tracking featue.

I performed a merge, committed and then re-attempted the merge (in order
to check the merge avoidance). When I attempted the second merge it
attempted to perform the merge again.

According to the manual this is implemented using the svn:mergeinfo
property to track the changes which have already been applied. When I
looked for the property upon the directory which had been merged it wasn't
there.

Now on reading further in the manual I came to the following section:
http://svnbook.red-bean.com/nightly/en/svn-book.html#svn.branchmerge.advanced.pre1.5clients

This states:
"If you've just upgraded your server to Subversion 1.5 or later, then
there's a significant risk that pre-1.5 Subversion clients can mess up
your automated merge tracking."

My intepretation of this is that in order to get merge tracking working
you need to also run 1.5.0 on the server side.

Is my understanding correct?

Is the assumption that we will all be upgrading our servers as soon as we
need this functionality - i.e. to get the big 1.5.0 functionality gain you
need both a 1.5.0 client *and* a 1.5.0 server?

Cheers,

Dg.

--
David Grierson
JPMorgan - IB Architecture - Source Code Management Consultant
GDP 228-5574 / DDI +44 141 228 5574 / Email david.x.grierson_at_jpmorgan.com
Alhambra House 6th floor, 45 Waterloo Street, Glasgow G2 6HS
 
Generally, this communication is for informational purposes only
and it is not intended as an offer or solicitation for the purchase
or sale of any financial instrument or as an official confirmation
of any transaction. In the event you are receiving the offering
materials attached below related to your interest in hedge funds or
private equity, this communication may be intended as an offer or
solicitation for the purchase or sale of such fund(s).  All market
prices, data and other information are not warranted as to
completeness or accuracy and are subject to change without notice.
Any comments or statements made herein do not necessarily reflect
those of JPMorgan Chase & Co., its subsidiaries and affiliates.
This transmission may contain information that is privileged,
confidential, legally privileged, and/or exempt from disclosure
under applicable law. If you are not the intended recipient, you
are hereby notified that any disclosure, copying, distribution, or
use of the information contained herein (including any reliance
thereon) is STRICTLY PROHIBITED. Although this transmission and any
attachments are believed to be free of any virus or other defect
that might affect any computer system into which it is received and
opened, it is the responsibility of the recipient to ensure that it
is virus free and no responsibility is accepted by JPMorgan Chase &
Co., its subsidiaries and affiliates, as applicable, for any loss
or damage arising in any way from its use. If you received this
transmission in error, please immediately contact the sender and
destroy the material in its entirety, whether in electronic or hard
copy format. Thank you.
Please refer to http://www.jpmorgan.com/pages/disclosures for
disclosures relating to UK legal entities.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-04-25 12:04:10 CEST

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