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

Re: merging advice

From: matt farey <matt.farey_at_gmail.com>
Date: Mon, 5 Oct 2009 15:51:14 +0000

Does anyone know what SVN server options there are for IBM i5 V6R1

Matt

Sent from my BlackBerry® wireless device

-----Original Message-----
From: Jeremy Mordkoff <jlm_at_ZeeVee.Com>
Date: Mon, 5 Oct 2009 11:20:35
To: <users_at_subversion.tigris.org>
Subject: merging advice

We recently started using merge tracking. My first attempt at updating
SVN to create all of the correct svn:mergeinfo records was somewhat
successful. I was able in the end to run a svn mergeinfo report and get
accurate info back.

 

But as part of all of this, I have ended up with some strange entries in
my merge-info records, for example, this is for the top of /zcode/trunk:

 

/repos/zcode/trunk:8*

/zcode/branches/es_zvb_reset:9521-9652*

/zcode/branches/rel_2_1:8309-9341*,9605*,9633*

/zcode/branches/rel_2_2:9342-9680*

/zcode/trunk:9-8308*,8603*,8612-8613*,8621*,8809*,8850*,8924*,9053*,9122
*,9271*

 

The first entry makes no sense to me as it includes the /repos part of
the path which is a directory name on the server and NOT part of the
path names in svn.

The next three lines make sense

The last line also does not make sense to me as there should be no need
to record a merge from trunk to trunk.

 

Should I be worried?

 

JLM

 

 

Jeremy Mordkoff

Director, QA, IT & Release

ZeeVee, Inc.

One Monarch Drive | Littleton, MA 01460

Office: 978.467.1395 x233 | Fax: 978.467.1404

Mobile: 978-257-2183

jlm_at_zeevee.com <mailto:jlm_at_zeevee.com>

www.zeevee.com <http://www.zeevee.com/>

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2403726

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2403764

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-10-05 17:52:04 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.