You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Paul Burba <pt...@gmail.com> on 2008/03/05 04:18:21 UTC
Re: svn commit: r29697 - in branches/1.5.x: . notes notes/tree-conflicts subversion/mod_dav_svn/reports www/images
On Tue, Mar 4, 2008 at 11:07 PM, <pb...@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? After this backport the mergeinfo on trunk is:
C:\SVN\src-branch>svn pg svn:mergeinfo
/branches/mergeinfo-api-cleanup:29311-29373
/branches/mergeinfoless-copies:27771-28001
/branches/reintegrate:28428-28977
/branches/sqlite-deep-copies:28196-28244
/branches/sqlite-mergeinfo-without-mergeinfo:28127-28195
/branches/sqlite-node-origins:27841-27889
/branches/whole-branch-merge:28245-28427
/trunk:29567-29568,29578
And the svnmerge-integrated props are:
C:\SVN\src-branch>svn pg svnmerge-integrated
/trunk:1-29080,29085-29089,29091,29094-29107,29111,29114,29117,29126-29127,29129-29133,29135-29150,29153-29164,29166,29174,29176-29186,29189,29193-29194,29
198-29200,29202-29206,29208-29251,29254-29256,29261,29267-29273,29277,29280-29281,29284,29287-29303,29305-29307,29309-29325,29327-29343,29345-29348,29358-2
9379,29381-29392,29397,29399,29401,29409,29412,29414-29415,29417-29423,29425-29426,29429,29433-29434,29436-29438,29440-29447,29449-29466,29468-29478,29482,
29484,29486-29487,29489,29491,29493,29496,29498,29508,29527-29528,29539-29540,29546,29553,29556,29559,29565,29583,29591,29594,29614,29619,29623,29625-29626
,29634,29671
Should I manually edit the svnmerge-integrated prop to add r29567,
r29568, and r29578?
Apologies if I screwed this up.
Paul
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: r29697 - in branches/1.5.x: . notes notes/tree-conflicts
subversion/mod_dav_svn/reports www/images
Posted by "C. Michael Pilato" <cm...@collab.net>.
Paul Burba wrote:
> On Tue, Mar 4, 2008 at 11:07 PM, <pb...@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 <cm...@collab.net>
CollabNet <> www.collab.net <> Distributed Development On Demand