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

Re: Incorrect handling of svn:mergeinfo during merging on the svnpatch-diff branch

From: Arfrever Frehtes Taifersar Arahesis <arfrever.fta_at_gmail.com>
Date: Mon, 1 Sep 2008 17:46:36 +0200

2008-09-01 17:39:20 Arfrever Frehtes Taifersar Arahesis napisaƂ(a):
> I discovered 2 bugs in handling of svn:mergeinfo when I was performing some
> merges on the svnpatch-diff branch.
>
> 1. Addition of incorrect svn:mergeinfo on some files or directories:
>
> Steps to reproduce:
> svn co -r32624 https://svn.collab.net/repos/svn/branches/svnpatch-diff subversion-svnpatch-diff-r32624
> cd subversion-svnpatch-diff-r32624
> svn merge -r32500:32620 ^/trunk
>
> This merge adds incorrect svn:mergeinfo on:
> build.conf
> subversion/include
> subversion/libsvn_subr
> subversion/tests/libsvn_subr
>
> These files / directories don't have svn:mergeinfo before merging.
> After merging, svn:mergeinfo on these files / directories doesn't contain:
> /trunk:1-31375,31378-32620
>
> (Next `svn merge ^/trunk` would try to merge r25664:30782 from trunk which causes
> many conflicts.)
>
>
> 2. Incomplete reversion of changes during reverse merging:
>
> Steps to reproduce:
> svn co -r32625 https://svn.collab.net/repos/svn/branches/svnpatch-diff subversion-svnpatch-diff-r32625
> cd subversion-svnpatch-diff-r32625
> svn merge -c-32625 ^/branches/svnpatch-diff
>
> r32625 added (incorrect) svn:mergeinfo on:
> build.conf
> subversion/include
> subversion/libsvn_subr
> subversion/tests/libsvn_subr
>
> Reverse merging should delete svn:mergeinfo property, but it leaves empty svn:mergeinfo.

3. Reverse merging mentioned above removes '/trunk:r1-31375' from svn:mergeinfo on branch root:
 $ svn pg svn:mergeinfo .
 /branches/1.5.x-r30215:30238
 /branches/bdb-reverse-deltas:31976-32455
 /branches/diff-callbacks3:29985-30687
 /branches/dont-save-plaintext-passwords-by-default:30654-31044
 /branches/gnome-keyring:30484-31336
 /branches/in-memory-cache:29755-31378
 /branches/issue-3000:31639,31642-31645,31647-31652,31654,31660
 /branches/issue-3220-dev:32136-32152
 /branches/kwallet:30711-31240
 /branches/log-g-performance:30867-30958
 /branches/svn-mergeinfo-enhancements:30045-30214
 /branches/svnserve-logging:29754-30819
 /trunk:31378-32500

-- 
Arfrever Frehtes Taifersar Arahesis

Received on 2008-09-01 17:49:06 CEST

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