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

Re: svn commit: r29697 - in branches/1.5.x: . notes notes/tree-conflicts subversion/mod_dav_svn/reports www/images

From: C. Michael Pilato <cmpilato_at_collab.net>
Date: Wed, 05 Mar 2008 08:04:37 -0500

Paul Burba wrote:
> On Tue, Mar 4, 2008 at 11:07 PM, <pburba_at_tigris.org> wrote:
>> Author: pburba
>> Date: Tue Mar 4 20:07:31 2008
>> New Revision: 29697
>>
>> Log:
>> Merge r29567, r29568, r29578 from trunk to 1.5.x branch.
>>
>> Modified:
>> branches/1.5.x/ (props changed)
>> branches/1.5.x/CHANGES (props changed)
>> branches/1.5.x/STATUS
>> branches/1.5.x/notes/reintegrate-todo.txt (props changed)
>> branches/1.5.x/notes/tree-conflicts/scratch-pad.txt (props changed)
>> branches/1.5.x/subversion/mod_dav_svn/reports/file-revs.c
>> branches/1.5.x/subversion/mod_dav_svn/reports/log.c
>> branches/1.5.x/www/images/subversion-diagram.png (props changed)
>> branches/1.5.x/www/images/subversion_logo-200x173.png (props changed)
>> branches/1.5.x/www/images/subversion_logo-384x332.png (props changed)
>> branches/1.5.x/www/images/subversion_logo_hor-468x64.png (props changed)
>
> Hmmmm...are we still supposed to use svnmerge.py for backports to
> 1.5.x?

For now (and until we resolved the "what to do about our repository"
thread), yes, we need to keep using svnmerge.py.

-- 
C. Michael Pilato <cmpilato_at_collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand

Received on 2008-03-05 14:04:59 CET

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