Re: [PATCH] branches/wc-replacements: write relative path in working copy log

On 8/26/05, Erik Huelsmann <ehuels@gmail.com> wrote:
> On 8/26/05, Ivan Zhakov <chemodax@gmail.com> wrote:
> > On 8/26/05, Erik Huelsmann <ehuels@gmail.com> wrote:
> > > On 8/26/05, Ivan Zhakov <chemodax@gmail.com> wrote:
> > > > On 8/26/05, Erik Huelsmann <ehuels@gmail.com> wrote:
> > > > > On 8/23/05, Ivan Zhakov <chemodax@gmail.com> wrote:
> > > > > > Hi,
> > > > > > There is small patch to the wc-replacements branch.
> > > > > >
> > > > > > [[
> > > > > > Write relative path in working copy log instead of full path.
> > > > > >
> > > > > > * subversion/libsvn_wc/adm_ops.c
> > > > > > (svn_wc_process_committed2): Pass relative path of revert file to
> > > > > > working copy log.
> > > > > > ]]
> > > > >
> > > > > Ivan, your patch seems to have picked up some stuff from the other
> > > > > patch I committed in r15897 (and merged to the branch this night).
> > > > >
> > > > > Could you please re-submit the patch?
> > > > Erik, really I was mistaken. But I have resubmitted patch already:
> > > > http://svn.haxx.se/dev/archive-2005-08/0961.shtml
> > >
> > > Ah. Sorry, missed that, but the patch there is damaged: it contains
> > > only the header of the second hunk.
> > >
> > > Could you resend please?
> > Ok, catch it now.
> > [[
> > Write relative path in working copy log instead of full path.
> > * subversion/libsvn_wc/adm_ops.c
> > (svn_wc_process_committed2): Pass relative path of revert file to
> > working copy log.
> > ]]
>
> I'm sorry to tell you, but it's damaged again.
>
> Could you either insert it into the message or zip it before attaching?
Like this?

[[
Write relative path in working copy log instead of full path.
* subversion/libsvn_wc/adm_ops.c
  (svn_wc_process_committed2): Pass relative path of revert file to
working copy log.
]]

Index: subversion/libsvn_wc/adm_ops.c
===================================================================
--- subversion/libsvn_wc/adm_ops.c (revision 15882)
+++ subversion/libsvn_wc/adm_ops.c (working copy)
@@ -317,8 +317,11 @@
 
       /* If the revert file exists it needs to be deleted when the file
        * is committed. */
- revert_file = svn_wc__text_revert_path (path, FALSE, pool);
- SVN_ERR (svn_io_check_path (revert_file, &kind, pool));
+ revert_file = svn_wc__text_revert_path (base_name, FALSE, pool);
+
+ SVN_ERR (svn_io_check_path (svn_path_join
(svn_wc_adm_access_path (adm_access),
+ revert_file, pool),
+ &kind, pool));
       if (kind == svn_node_file)
         {
           svn_xml_make_open_tag (&logtags, pool, svn_xml_self_closing,
           

-- 
Ivan Zhakov
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org