You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Arfrever Frehtes Taifersar Arahesis <ar...@gmail.com> on 2008/10/12 23:05:37 UTC
Merging fails on the svnpatch-diff branch
I tried to merge some changes from trunk to the svnpatch-diff branch, but
`svn merge` fails:
Merging using Neon:
(It fails at r33536)
$ svn merge ^/trunk
...
U tools/dist/post-to-tigris.py
A tools/buildbot/slaves/win32-xp-VS2005
A tools/buildbot/slaves/win32-xp-VS2005/do_all.bat
A tools/buildbot/slaves/win32-xp-VS2005/svncheck.bat
A tools/buildbot/slaves/win32-xp-VS2005/config.bat
A tools/buildbot/slaves/win32-xp-VS2005/svnbuild.bat
A tools/buildbot/slaves/win32-xp-VS2005/svnlog.bat
A tools/buildbot/slaves/win32-xp-VS2005/svnclean.bat
svn: '/repos/svn/!svn/bc/33609/branches/svnpatch-diff/tools/buildbot/slaves/win32-xp-VS2005' path not found
svn: Error reading spooled REPORT request response
$
Merging using Serf:
$ svn merge ^/trunk
svn: XML parsing failed: (400 Bad Request)
$
--
Arfrever Frehtes Taifersar Arahesis
Re: Merging fails on the svnpatch-diff branch
Posted by Paul Burba <pt...@gmail.com>.
On Thu, Oct 16, 2008 at 4:28 PM, Lieven Govaerts <sv...@mobsol.be> wrote:
> Paul Burba wrote:
>> On Thu, Oct 16, 2008 at 11:24 AM, Lieven Govaerts <sv...@mobsol.be> wrote:
>>> Arfrever Frehtes Taifersar Arahesis wrote:
>>>> I tried to merge some changes from trunk to the svnpatch-diff branch, but
>>>> `svn merge` fails:
>>>>
>>>> Merging using Neon:
>>>> (It fails at r33536)
>>>>
>>>> $ svn merge ^/trunk
>>>> ...
>>>> U tools/dist/post-to-tigris.py
>>>> A tools/buildbot/slaves/win32-xp-VS2005
>>>> A tools/buildbot/slaves/win32-xp-VS2005/do_all.bat
>>>> A tools/buildbot/slaves/win32-xp-VS2005/svncheck.bat
>>>> A tools/buildbot/slaves/win32-xp-VS2005/config.bat
>>>> A tools/buildbot/slaves/win32-xp-VS2005/svnbuild.bat
>>>> A tools/buildbot/slaves/win32-xp-VS2005/svnlog.bat
>>>> A tools/buildbot/slaves/win32-xp-VS2005/svnclean.bat
>>>> svn: '/repos/svn/!svn/bc/33609/branches/svnpatch-diff/tools/buildbot/slaves/win32-xp-VS2005' path not found
>>>> svn: Error reading spooled REPORT request response
>>>> $
>>>>
>>>> Merging using Serf:
>>>>
>>>> $ svn merge ^/trunk
>>>> svn: XML parsing failed: (400 Bad Request)
>>>> $
>>>>
>>> The root cause of the '400 Bad Request' you got over ra_serf is fixed in
>>> r33687, but only with serf-trunk.
>>>
>>> This merge over ra_serf now results in the same 'path not found" error.
>>> I'll have a look into that.
>>>
>>
>> Lieven,
>>
>> Fixed that bug in r33693.
>>
>
> Yup, your patch confirms my understanding of the problem, and the above
> merge now works.
> Looks like we can backport this to 1.5.x too.
Agreed and done.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Merging fails on the svnpatch-diff branch
Posted by Lieven Govaerts <sv...@mobsol.be>.
Paul Burba wrote:
> On Thu, Oct 16, 2008 at 11:24 AM, Lieven Govaerts <sv...@mobsol.be> wrote:
>> Arfrever Frehtes Taifersar Arahesis wrote:
>>> I tried to merge some changes from trunk to the svnpatch-diff branch, but
>>> `svn merge` fails:
>>>
>>> Merging using Neon:
>>> (It fails at r33536)
>>>
>>> $ svn merge ^/trunk
>>> ...
>>> U tools/dist/post-to-tigris.py
>>> A tools/buildbot/slaves/win32-xp-VS2005
>>> A tools/buildbot/slaves/win32-xp-VS2005/do_all.bat
>>> A tools/buildbot/slaves/win32-xp-VS2005/svncheck.bat
>>> A tools/buildbot/slaves/win32-xp-VS2005/config.bat
>>> A tools/buildbot/slaves/win32-xp-VS2005/svnbuild.bat
>>> A tools/buildbot/slaves/win32-xp-VS2005/svnlog.bat
>>> A tools/buildbot/slaves/win32-xp-VS2005/svnclean.bat
>>> svn: '/repos/svn/!svn/bc/33609/branches/svnpatch-diff/tools/buildbot/slaves/win32-xp-VS2005' path not found
>>> svn: Error reading spooled REPORT request response
>>> $
>>>
>>> Merging using Serf:
>>>
>>> $ svn merge ^/trunk
>>> svn: XML parsing failed: (400 Bad Request)
>>> $
>>>
>> The root cause of the '400 Bad Request' you got over ra_serf is fixed in
>> r33687, but only with serf-trunk.
>>
>> This merge over ra_serf now results in the same 'path not found" error.
>> I'll have a look into that.
>>
>
> Lieven,
>
> Fixed that bug in r33693.
>
Yup, your patch confirms my understanding of the problem, and the above
merge now works. Looks like we can backport this to 1.5.x too.
Lieven
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Merging fails on the svnpatch-diff branch
Posted by Paul Burba <pt...@gmail.com>.
On Thu, Oct 16, 2008 at 11:24 AM, Lieven Govaerts <sv...@mobsol.be> wrote:
> Arfrever Frehtes Taifersar Arahesis wrote:
>> I tried to merge some changes from trunk to the svnpatch-diff branch, but
>> `svn merge` fails:
>>
>> Merging using Neon:
>> (It fails at r33536)
>>
>> $ svn merge ^/trunk
>> ...
>> U tools/dist/post-to-tigris.py
>> A tools/buildbot/slaves/win32-xp-VS2005
>> A tools/buildbot/slaves/win32-xp-VS2005/do_all.bat
>> A tools/buildbot/slaves/win32-xp-VS2005/svncheck.bat
>> A tools/buildbot/slaves/win32-xp-VS2005/config.bat
>> A tools/buildbot/slaves/win32-xp-VS2005/svnbuild.bat
>> A tools/buildbot/slaves/win32-xp-VS2005/svnlog.bat
>> A tools/buildbot/slaves/win32-xp-VS2005/svnclean.bat
>> svn: '/repos/svn/!svn/bc/33609/branches/svnpatch-diff/tools/buildbot/slaves/win32-xp-VS2005' path not found
>> svn: Error reading spooled REPORT request response
>> $
>>
>> Merging using Serf:
>>
>> $ svn merge ^/trunk
>> svn: XML parsing failed: (400 Bad Request)
>> $
>>
>
> The root cause of the '400 Bad Request' you got over ra_serf is fixed in
> r33687, but only with serf-trunk.
>
> This merge over ra_serf now results in the same 'path not found" error.
> I'll have a look into that.
>
Lieven,
Fixed that bug in r33693.
Paul
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Merging fails on the svnpatch-diff branch
Posted by Mark Phippard <ma...@gmail.com>.
On Thu, Oct 16, 2008 at 11:24 AM, Lieven Govaerts <sv...@mobsol.be> wrote:
> The root cause of the '400 Bad Request' you got over ra_serf is fixed in
> r33687, but only with serf-trunk.
>
> This merge over ra_serf now results in the same 'path not found" error.
> I'll have a look into that.
I'd suggest you ping pburba on IRC to find out how far he is into
looking at it. I am sure he will appreciate some more eyes.
--
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Merging fails on the svnpatch-diff branch
Posted by Lieven Govaerts <sv...@mobsol.be>.
Arfrever Frehtes Taifersar Arahesis wrote:
> I tried to merge some changes from trunk to the svnpatch-diff branch, but
> `svn merge` fails:
>
> Merging using Neon:
> (It fails at r33536)
>
> $ svn merge ^/trunk
> ...
> U tools/dist/post-to-tigris.py
> A tools/buildbot/slaves/win32-xp-VS2005
> A tools/buildbot/slaves/win32-xp-VS2005/do_all.bat
> A tools/buildbot/slaves/win32-xp-VS2005/svncheck.bat
> A tools/buildbot/slaves/win32-xp-VS2005/config.bat
> A tools/buildbot/slaves/win32-xp-VS2005/svnbuild.bat
> A tools/buildbot/slaves/win32-xp-VS2005/svnlog.bat
> A tools/buildbot/slaves/win32-xp-VS2005/svnclean.bat
> svn: '/repos/svn/!svn/bc/33609/branches/svnpatch-diff/tools/buildbot/slaves/win32-xp-VS2005' path not found
> svn: Error reading spooled REPORT request response
> $
>
> Merging using Serf:
>
> $ svn merge ^/trunk
> svn: XML parsing failed: (400 Bad Request)
> $
>
The root cause of the '400 Bad Request' you got over ra_serf is fixed in
r33687, but only with serf-trunk.
This merge over ra_serf now results in the same 'path not found" error.
I'll have a look into that.
Lieven
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Merging fails on the svnpatch-diff branch (and unrelated tree-conflicts error)
Posted by Arfrever Frehtes Taifersar Arahesis <ar...@gmail.com>.
2008-10-13 18:50:37 Daniel Shahaf napisał(a):
> Arfrever Frehtes Taifersar Arahesis wrote on Mon, 13 Oct 2008 at 18:23 +0200:
> > 2008-10-13 10:54:41 Daniel Shahaf napisał(a):
> > > By the way, when I tried the same merge into a wc of the branch @r33608
> > > (before Arfrever's merge at r33609), I got a few hundred lines of conflicts
> > > and tree-conflicts, and also a tree-conflicts error at the end ("Attempt to
> > > add tree conflict that already exists", IIRC).
> >
> > svn:merginfo was partially incorrect, so I recorded '/trunk:r25664-28216' in
> > svn:mergeinfo on '.', 'build.conf', 'subversion/include', 'subversion/libsvn_subr'
> > and 'subversion/tests/libsvn_subr' before merging.
>
> Ouch, did you set it manually on all these dirs or did you use
> 'svn merge --record-only'?
I used 'svn merge --record-only'.
> If you manually fix the mergeinfo, please say that explicitly in the log
> message. Our repos' mergeinfo is complicated enough without undocumented[1]
> merges kicking in. Thanks.
OK. I will update svn:log.
> With that change (achieved by 'svn merge --record-only'), the output is:
>
> U tools\dist\post-to-tigris.py
> A tools\buildbot\slaves\win32-xp-VS2005
> A tools\buildbot\slaves\win32-xp-VS2005\do_all.bat
> A tools\buildbot\slaves\win32-xp-VS2005\svncheck.bat
> A tools\buildbot\slaves\win32-xp-VS2005\config.bat
> A tools\buildbot\slaves\win32-xp-VS2005\svnbuild.bat
> A tools\buildbot\slaves\win32-xp-VS2005\svnlog.bat
> A tools\buildbot\slaves\win32-xp-VS2005\svnclean.bat
> ..\..\..\subversion\libsvn_fs_fs\tree.c:661: (apr_err=160013)
> svn: File not found: revision 33615, path '/branches/svnpatch-diff/tools/buildbot/slaves/win32-xp-VS2005'
>
> Daniel
>
> [1] "undocumented": not shown in the commit mails, in viewvc, or in the log message.
--
Arfrever Frehtes Taifersar Arahesis
Re: Merging fails on the svnpatch-diff branch (and unrelated
tree-conflicts error)
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
Arfrever Frehtes Taifersar Arahesis wrote on Mon, 13 Oct 2008 at 18:23 +0200:
> 2008-10-13 10:54:41 Daniel Shahaf napisał(a):
> > By the way, when I tried the same merge into a wc of the branch @r33608
> > (before Arfrever's merge at r33609), I got a few hundred lines of conflicts
> > and tree-conflicts, and also a tree-conflicts error at the end ("Attempt to
> > add tree conflict that already exists", IIRC).
>
> svn:merginfo was partially incorrect, so I recorded '/trunk:r25664-28216' in
> svn:mergeinfo on '.', 'build.conf', 'subversion/include', 'subversion/libsvn_subr'
> and 'subversion/tests/libsvn_subr' before merging.
Ouch, did you set it manually on all these dirs or did you use
'svn merge --record-only'?
If you manually fix the mergeinfo, please say that explicitly in the log
message. Our repos' mergeinfo is complicated enough without undocumented[1]
merges kicking in. Thanks.
>
With that change (achieved by 'svn merge --record-only'), the output is:
U tools\dist\post-to-tigris.py
A tools\buildbot\slaves\win32-xp-VS2005
A tools\buildbot\slaves\win32-xp-VS2005\do_all.bat
A tools\buildbot\slaves\win32-xp-VS2005\svncheck.bat
A tools\buildbot\slaves\win32-xp-VS2005\config.bat
A tools\buildbot\slaves\win32-xp-VS2005\svnbuild.bat
A tools\buildbot\slaves\win32-xp-VS2005\svnlog.bat
A tools\buildbot\slaves\win32-xp-VS2005\svnclean.bat
..\..\..\subversion\libsvn_fs_fs\tree.c:661: (apr_err=160013)
svn: File not found: revision 33615, path '/branches/svnpatch-diff/tools/buildbot/slaves/win32-xp-VS2005'
Daniel
[1] "undocumented": not shown in the commit mails, in viewvc, or in the log message.
Re: Merging fails on the svnpatch-diff branch (and unrelated tree-conflicts error)
Posted by Arfrever Frehtes Taifersar Arahesis <ar...@gmail.com>.
2008-10-13 10:54:41 Daniel Shahaf napisał(a):
> By the way, when I tried the same merge into a wc of the branch @r33608
> (before Arfrever's merge at r33609), I got a few hundred lines of conflicts
> and tree-conflicts, and also a tree-conflicts error at the end ("Attempt to
> add tree conflict that already exists", IIRC).
svn:merginfo was partially incorrect, so I recorded '/trunk:r25664-28216' in
svn:mergeinfo on '.', 'build.conf', 'subversion/include', 'subversion/libsvn_subr'
and 'subversion/tests/libsvn_subr' before merging.
--
Arfrever Frehtes Taifersar Arahesis
Re: Merging fails on the svnpatch-diff branch (and unrelated
tree-conflicts error)
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
Arfrever Frehtes Taifersar Arahesis wrote on Mon, 13 Oct 2008 at 01:05 +0200:
> I tried to merge some changes from trunk to the svnpatch-diff branch, but
> `svn merge` fails:
>
> Merging using Neon:
> (It fails at r33536)
>
> $ svn merge ^/trunk
> ...
> U tools/dist/post-to-tigris.py
> A tools/buildbot/slaves/win32-xp-VS2005
> A tools/buildbot/slaves/win32-xp-VS2005/do_all.bat
> A tools/buildbot/slaves/win32-xp-VS2005/svncheck.bat
> A tools/buildbot/slaves/win32-xp-VS2005/config.bat
> A tools/buildbot/slaves/win32-xp-VS2005/svnbuild.bat
> A tools/buildbot/slaves/win32-xp-VS2005/svnlog.bat
> A tools/buildbot/slaves/win32-xp-VS2005/svnclean.bat
> svn: '/repos/svn/!svn/bc/33609/branches/svnpatch-diff/tools/buildbot/slaves/win32-xp-VS2005' path not found
/me pleads guilty.
> svn: Error reading spooled REPORT request response
> $
>
> Merging using Serf:
>
> $ svn merge ^/trunk
> svn: XML parsing failed: (400 Bad Request)
> $
>
>
I tried the same merge over ra_local / fsfs into a pristine wc of the
branch @r33610.
% svn merge --accept=postpone ^/trunk
..\..\..\subversion\libsvn_fs_fs\tree.c:661: (apr_err=160013)
svn: File not found: revision 33610, path '/branches/svnpatch-diff/tools/buildbot/slaves/win32-xp-VS2005'
Karl saw a similar error trying to sync the issue-2843-dev branch.
By the way, when I tried the same merge into a wc of the branch @r33608
(before Arfrever's merge at r33609), I got a few hundred lines of conflicts
and tree-conflicts, and also a tree-conflicts error at the end ("Attempt to
add tree conflict that already exists", IIRC).
Daniel