> Karl Fogel wrote:
> > Daniel Shahaf <d.s_at_daniel.shahaf.co.il> writes:
> > [...]
> >> And I agree with him that svnlook shouldn't depend on libsvn_ra.
> >
> > I suspect you're right.
> >
> > Julian, maybe r32015/r32018/r32021 should be redone to put this code in
> > libsvn_subr and svn_xml_private.h instead? I know you didn't want to
> > put property-specific code in the 'svn_xml__' namespace, but that would
> > appear to be by far the lesser evil here... Thoughts?
I am at the BCS/itSMG conference today and tomorrow, so no time to do
more than revert this.
Reverting...
[[[
$ svn merge -c r-32021 -c -32018 -c -32015 .
--- Reverse-merging r32021 into '.':
U subversion/svn/props.c
U subversion/svn/propget-cmd.c
U subversion/libsvn_client/xml.c
U subversion/svnlook/main.c
--- Reverse-merging r32018 into '.':
U subversion/include/svn_client.h
D subversion/include/private/svn_client_private.h
svn: Working copy path 'subversion/include/private/svn_client_private.h' does not exist in repository
]]]
Shucks, what now?
[[[
$ svn revert -R subversion/
Reverted 'subversion/svn/props.c'
Reverted 'subversion/svn/propget-cmd.c'
Reverted 'subversion/include/svn_client.h'
Reverted 'subversion/include/private/svn_client_private.h'
Reverted 'subversion/libsvn_client/xml.c'
Reverted 'subversion/svnlook/main.c'
$ svn merge --ignore-ancestry -c -32021 -c -32018 -c -32015 .
--- Reverse-merging r32021 into '.':
U subversion/svn/props.c
U subversion/svn/propget-cmd.c
U subversion/libsvn_client/xml.c
U subversion/svnlook/main.c
--- Reverse-merging r32018 into '.':
U subversion/include/svn_client.h
D subversion/include/private/svn_client_private.h
--- Reverse-merging r32015 into '.':
U build.conf
G subversion/svn/props.c
U subversion/svn/cl.h
G subversion/svn/propget-cmd.c
G subversion/include/svn_client.h
Skipped 'subversion/libsvn_client/xml.c'
G subversion/svnlook/main.c
]]]
I think "skipped" is where it should delete the file.
[[[
$ svn diff --summarize -c -32021
M subversion/svn/props.c
M subversion/svn/propget-cmd.c
M subversion/libsvn_client/xml.c
M subversion/svnlook/main.c
$ svn diff --summarize -c -32018
M subversion/include/svn_client.h
D subversion/include/private/svn_client_private.h
$ svn diff --summarize -c -32015
M build.conf
M subversion/svn/props.c
M subversion/svn/cl.h
M subversion/svn/propget-cmd.c
M subversion/include/svn_client.h
D subversion/libsvn_client/xml.c
M subversion/svnlook/main.c
]]]
Yes, confirmed.
[[[
$ svn delete subversion/libsvn_client/xml.c
svn: Use --force to override this restriction
svn: 'subversion/libsvn_client/xml.c' has local modifications
$ svn delete --force subversion/libsvn_client/xml.c
D subversion/libsvn_client/xml.c
]]]
Build-and-test ... OK up to test 35 of 62.
[[[
$ svn ci
Sending build.conf
Deleting subversion/include/private/svn_client_private.h
Deleting subversion/libsvn_client/xml.c
Sending subversion/svn/cl.h
Sending subversion/svn/propget-cmd.c
Sending subversion/svn/props.c
Sending subversion/svnlook/main.c
Transmitting file data .....
Committed revision 32043.
]]]
Senthil Kumaran S wrote:
> How about the attached patch.
>
> [[[
> Follow up to r32015, r32018, r32021, r32022.
>
> Move XML-printing function from libsvn_client to libsvn_subr.
> [...]
Sure, that might be good. If someone would like to check it over and
commit it that would be great.
- Julian
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-07-09 01:10:13 CEST