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

Weird svn merge tracking property values

From: Murli Varadachari <mvaradachari_at_facebook.com>
Date: Sun, 17 Aug 2008 23:58:09 -0700

I am having a hard time deciphering the way the svn:mergeinfo information is
stored. ==>

Recently I reformatted a 30GB svn repository from 1.4.x to svn 1.5 .1 [
dump / load ]. The client is also at 1.5.1.

I created a fresh branch off an existing trunk with the intentions of trying
out a few trunk-to-branch and branch ≠to-trunk merges.

Here are the steps I took

(a) created a new branch from an existing trunk

svn cp -m "created a new branch from tfb/trunk/www"
svn+ssh://HOST/svnroot/tfb/trunk/www
svn+ssh://HOST/svnroot/tfb/branches/tfb1

(b) checked out tfb/trunk/www and edited some files and committed into
tfb/trunk/www

© checked out tfb/branches/tfb1 and merged tfb/trunk/www

$ svn merge svn+ssh://HOST/svnroot/tfb/trunk/www <wc-tfb1>

--- Merging r115503 through r115504 into '.':
U scripts/hallofheroes/parse-svn-commits
U scripts/hallofheroes/test_parse_svn_commits

(d) svn commit ≠m ≥commit test≤ <wc-tfb1>

(d) Listed svn:mergeinfo on svn+ssh://HOST/svnroot/tfb/branches/tfb1

Output ==>>

   /tfb/branches/facelift/www:r218-5929
   /tfb/trunk/www:r12-217,115503-115504

*ISSUE*: This is a rather strange merge information. I would have expected
something like ≥/tfb/trunk/www:12-115504≤. Also what happened to all the
commits between 217 & 115500. A ≥svn log
svn+ssh://HOST/svnroot/tfb/trunk/www≤ indicates thousands of commits?

However a subsequent merge doesnĻt update any files except for the dummy
svn:mergeinfo update to reflect the latest committed revision.

Is there something to with the repository history [ 4 yrs worth of stuff ] ‹
can this be changed so that I can it represented as 0-115504 being blocked
from further merges.

Cheers
murli
Received on 2008-08-18 08:58:52 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.