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

Re: merge-tracking branch should have subversion/tests/cmdline/special_tests_data/bad-special-type.dump

From: Karl Fogel <kfogel_at_red-bean.com>
Date: 2007-03-06 20:29:42 CET

"Paul Burba" <pburba@collab.net> writes:
> I used svnmerge.py to merge up, something must have gone wrong, I think
> I saw Karl mention this problem on his sparse directories branch. I'll
> fix it, sorry about that.

Yes, svnmerge.py failed to add to the branch files that were new on
trunk. Peter Lundblad noticed and fixed the branch. I think r23546
was the buggy merge, see below. (I don't have time to poke into
svnmerge.py right now, unfortunately.)

-Karl

   ------------------------------------------------------------------------
   r23550 | lundblad | 2007-03-02 02:48:47 -0800 (Fri, 02 Mar 2007) | 5 lines
   
   * /branches/sparse-directories:
     Add a few files that have been added on trunk, but, for some reason,
     were not added to this branch when merging.
     This, among other things, makes the branch buildable.
   
   ------------------------------------------------------------------------
   r23546 | kfogel | 2007-03-01 17:31:15 -0800 (Thu, 01 Mar 2007) | 3 lines
   
   Merged revisions 23447-23545 via svnmerge from
   http://svn.collab.net/repos/svn/trunk to the sparse-directories branch.
   
   ------------------------------------------------------------------------
   r23447 | kfogel | 2007-02-21 01:10:52 -0800 (Wed, 21 Feb 2007) | 3 lines
   
   Merged revisions 23402-23446 via svnmerge from
   http://svn.collab.net/repos/svn/trunk to the sparse-directories branch.
   
   ------------------------------------------------------------------------
   r23404 | kfogel | 2007-02-15 16:57:46 -0800 (Thu, 15 Feb 2007) | 3 lines
   
   Merged revisions 23371-23401 via svnmerge from
   http://svn.collab.net/repos/svn/trunk to the sparse-directories branch.
   
   ------------------------------------------------------------------------
   r23371 | kfogel | 2007-02-08 02:01:26 -0800 (Thu, 08 Feb 2007) | 3 lines
   
   Merged revisions 23354-23370 via svnmerge from
   http://svn.collab.net/repos/svn/trunk to the sparse-directories branch.

>> -----Original Message-----
>> From: Kamesh Jayachandran [mailto:kamesh@collab.net]
>> Sent: Tuesday, March 06, 2007 8:44 AM
>> To: SVN Dev
>> Subject: merge-tracking branch should have
>> subversion/tests/cmdline/special_tests_data/bad-special-type.dump
>>
>> Hi All,
>> Last merge of trunk to merge-tracking(r23541) branch failed to bring
>> subversion/tests/cmdline/special_tests_data/bad-special-
>> type.dump(introduced
>> in r23467).
>>
>> Because of this special_tests 11 is failing in merge-tracking branch.
>>
>> With regards
>> Kamesh Jayachandran
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
>> For additional commands, e-mail: dev-help@subversion.tigris.org
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Mar 6 20:29:56 2007

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