Hello! We have been using svnmerge successfully for some time now for one-way-merges from trunk into a production branch.
Recently however we observed that revisions that have been previously merged and saved to the svnmerge-integrated property suddenly disappear from the svnmerge-integrated property and thus are being listed again in 'svnmerge avail' output. This happened for example with revision 5215 which had previously been merged with svnmerge into the production branch: $ svn log -r5215 https://.../trunk ------------------------------------------------------------------------ r5215 | tils | 2006-11-01 13:50:51 +0100 (Wed, 01 Nov 2006) | 5 lines foobar commit msg It was merged into production With revision 5218: $ svn log -r5218 https://.../branches/production ------------------------------------------------------------------------ r5218 | tils | 2006-11-01 17:41:15 +0100 (Wed, 01 Nov 2006) | 19 lines Merged revisions 5215-5217 via svnmerge from https://.../trunk ........ r5215 | tils | 2006-11-01 13:50:51 +0100 (Wed, 01 Nov 2006) | 5 lines foobar commit msg At this point it is correctly in the svnmerge-integrated list: $ svn propget -r5218 svnmerge-integrated . /web/trunk:1-394,397-490,492-497,499-587,589-590,593,595,598-612,614-639,641-831,833-893,895-1022,1024-1080,1082-1544,1548-1556,1558-1574,1576-1626,1628-3296,3298-3357,3359,3362-3363,3365-3366,3368,3370,3372-3996,3998-4157,4159-5034,5036-5062,5064-5067,5069-5177,5179-5183,5185-5188,5193-5194,5197-5200,5202,5206,5215-5217 It was removed again from the svnmerge-integrated list in revision 5230 which was another merge using svnmerge: $ svn log -r5230 https://.../branches/production ------------------------------------------------------------------------ r5230 | tim | 2006-11-02 12:20:47 +0100 (Thu, 02 Nov 2006) | 9 lines Merged revisions 5229 via svnmerge from ... ........ r5229 | tim | 2006-11-02 11:59:26 +0100 (Thu, 02 Nov 2006) | 2 lines another commit msg So between 5229 to 5230 svnmerge several revisions were removed from the svnmerge-integrated property: [EMAIL PROTECTED]:~/production$ svn propget -r5229 svnmerge-integrated . /web/trunk:1-394,397-490,492-497,499-587,589-590,593,595,598-612,614-639,641-831,833-893,895-1022,1024-1080,1082-1544,1548-1556,1558-1574,1576-1626,1628-3296,3298-3357,3359,3362-3363,3365-3366,3368,3370,3372-3996,3998-4157,4159-5034,5036-5062,5064-5067,5069-5177,5179-5183,5185-5188,5193-5194,5197-5200,5202,5206,5215-5217,5227 [EMAIL PROTECTED]:~/production$ svn propget -r5230 svnmerge-integrated . /web/trunk:1-394,397-490,492-497,499-587,589-590,593,595,598-612,614-639,641-831,833-893,895-1022,1024-1080,1082-1544,1548-1556,1558-1574,1576-1626,1628-3296,3298-3357,3359,3362-3363,3365-3366,3368,3370,3372-3996,3998-4157,4159-4948,4951-5034,5036-5062,5064-5066,5069-5077,5081-5085,5087,5090-5092,5095-5128,5130,5132-5140,5142-5147,5149,5151-5160,5163-5170,5173,5175,5179-5180,5182,5229 Any hints on why this could have happened? Also I would appreciate suggestions how to fix our current value of svnmerge-integrated. Should I just insert the forgotten revisions in order, separated by commas? Or would it be necessary to concatenate consecutive revs into ranges? Til _______________________________________________ Svnmerge mailing list [email protected] http://www.orcaware.com/mailman/listinfo/svnmerge
