On 8/18/08 6:48 AM, "Mark Phippard" <markphip_at_gmail.com> wrote:
> On Mon, Aug 18, 2008 at 2:58 AM, Murli Varadachari
> <mvaradachari_at_facebook.com> wrote:
>> >
>> > 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
>> >
>> > (c) 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.
>
>>> >>The mergeinfo property does not include the "natural history" of a
>>> >> path.
>>> >>So in the perfect case, the property would have had this value:
>>> >> /tfb/trunk/www:r115503-115504
>
> what about all the values prior to the branch point I.E < 115503. Does the
> merge command recognize the branch point internally. Syntactically isnıt there
> some way to indicate that no revisions prior to 11503 would be merged. The
> current syntax appears to indicate that 1155503-115504 is cherry picked and
> that all other revisions could potentially be merged?
>
> Also if I run ³ svn mergeinfo ‹show-revs eligible
> svn+ssh://HOST/svnroot/tfb/branches/tfb1² it shows the latest rev point as
> being eligible to merge even though that is due to some unrelated commits ‹ I
> think this was raised earlier as being confusing to the user since there is
> really nothing to merge.
>
>>> >>As for the other values, did you look to see if there was any property
>>> >>value before you did this merge?
>
> not sure
>
>
> --
> Thanks
>
> Mark Phippard
> http://markphip.blogspot.com/
>
Received on 2008-08-18 17:04:38 CEST