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

svn mergeinfo broken after merge of mergeinfo-less-copies branch

From: Mark Phippard <markphip_at_gmail.com>
Date: 2007-11-25 02:02:14 CET

I am updating a JavaHL test which looks at mergeinfo. It was of
course failing because there is no longer mergeinfo from the copy. In
the process of updating the test, I noticed a bug in the svn mergeinfo
command. Consider this scenario:

Standard Greek Tree

r2: svn mkdir branches
r3 svn cp A branches/A
r4: changes and commit from A
r5: merge to branches/A and commit
r6: more changes and commit on A

Now run:

$ svn mergeinfo branches/a
Path: branches/a
  Source path: /A
    Merged ranges: r2:4
    Eligible ranges: r1:2, r4:6

The Eligible ranges should presumably not include r1:2 and just 4:6

I am going to commit my JavaHL test that expects just 4:6 and I will
update it if I am wrong and it is supposed to also include 1:2.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Nov 25 02:02:26 2007

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

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