You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Ivan Zhakov <ch...@gmail.com> on 2005/08/23 11:47:02 UTC
[PATCH] branches/wc-replacements: write relative path in working copy log
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 Zhakov
Re: [PATCH] branches/wc-replacements: write relative path in working copy log
Posted by Ivan Zhakov <ch...@gmail.com>.
Sorry, by mistake I have attached diff of all my changes. Check
attachements for proper version.
On 8/23/05, Ivan Zhakov <ch...@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 Zhakov
Re: [PATCH] branches/wc-replacements: write relative path in working copy log
Posted by Erik Huelsmann <eh...@gmail.com>.
On 8/31/05, Julian Foad <ju...@btopenworld.com> wrote:
> >>[[
> >>Write relative path in working copy log instead of full path.
>
> In each log message, please try to say why the change is being made.
> Otherwise, a future committer may want to change it back to a full path, and
> won't know whether you had a better reason for making it a relative path.
The README file in the libsvn_wc directory documents it should be a
relative path. But, sure, I can put that info into the log message.
bye,
Erik.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] branches/wc-replacements: write relative path in working copy log
Posted by Erik Huelsmann <eh...@gmail.com>.
> Er, I think you must have misread what I said. Comments in the code should
> certainly indicate why the code does what it did ... but not why it was changed
> from some previous behaviour. Comments about changes to the code belong in the
> change management system, don't they?
>
> So, in this case, the code could say "We use a relative path here as specified
> in the design document" (though that's presumably implicit and redundant), and
> the change log should say something to the effect of, "Changed to a relative
> path because it was previously contravening the documented design."
Done.
bye,
Erik.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] branches/wc-replacements: write relative path in working
copy log
Posted by Julian Foad <ju...@btopenworld.com>.
Branko Čibej wrote:
> Julian Foad wrote:
>
>> In each log message, please try to say why the change is being made.
>> Otherwise, a future committer may want to change it back to a full
>> path, and won't know whether you had a better reason for making it a
>> relative path.
>
> I disagree. The "why" should be in a comment in the code, not in a log
> message where is't not seen immediately by anyone browsing through the
> code.
Er, I think you must have misread what I said. Comments in the code should
certainly indicate why the code does what it did ... but not why it was changed
from some previous behaviour. Comments about changes to the code belong in the
change management system, don't they?
So, in this case, the code could say "We use a relative path here as specified
in the design document" (though that's presumably implicit and redundant), and
the change log should say something to the effect of, "Changed to a relative
path because it was previously contravening the documented design."
- Julian
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] branches/wc-replacements: write relative path in working
copy log
Posted by Branko Čibej <br...@xbc.nu>.
Julian Foad wrote:
>>> [[
>>> Write relative path in working copy log instead of full path.
>>
>
> In each log message, please try to say why the change is being made.
> Otherwise, a future committer may want to change it back to a full
> path, and won't know whether you had a better reason for making it a
> relative path.
I disagree. The "why" should be in a comment in the code, not in a log
message where is't not seen immediately by anyone browsing through the code.
-- Brane
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] branches/wc-replacements: write relative path in working
copy log
Posted by Julian Foad <ju...@btopenworld.com>.
>> [[
>>Write relative path in working copy log instead of full path.
In each log message, please try to say why the change is being made.
Otherwise, a future committer may want to change it back to a full path, and
won't know whether you had a better reason for making it a relative path.
- Julian
>>* subversion/libsvn_wc/adm_ops.c
>> (svn_wc_process_committed2): Pass relative path of revert file to
>>working copy log.
>>]]
Erik Huelsmann wrote:
> I fixed the 2 nits (small comments) above and committed the change in r15935.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] branches/wc-replacements: write relative path in working copy log
Posted by Erik Huelsmann <eh...@gmail.com>.
> > Could you either insert it into the message or zip it before attaching?
> Like this?
Yes. Thanks.
>
> [[
> 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),
The line above is longer than 80 characters.
> + revert_file, pool),
> + &kind, pool));
These lines don't have the correct indenting.
> if (kind == svn_node_file)
> {
> svn_xml_make_open_tag (&logtags, pool, svn_xml_self_closing,
I fixed the 2 nits (small comments) above and committed the change in r15935.
bye,
Erik.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] branches/wc-replacements: write relative path in working copy log
Posted by Ivan Zhakov <ch...@gmail.com>.
On 8/26/05, Erik Huelsmann <eh...@gmail.com> wrote:
> On 8/26/05, Ivan Zhakov <ch...@gmail.com> wrote:
> > On 8/26/05, Erik Huelsmann <eh...@gmail.com> wrote:
> > > On 8/26/05, Ivan Zhakov <ch...@gmail.com> wrote:
> > > > On 8/26/05, Erik Huelsmann <eh...@gmail.com> wrote:
> > > > > On 8/23/05, Ivan Zhakov <ch...@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
Re: [PATCH] branches/wc-replacements: write relative path in working copy log
Posted by Erik Huelsmann <eh...@gmail.com>.
On 8/26/05, Ivan Zhakov <ch...@gmail.com> wrote:
> On 8/26/05, Erik Huelsmann <eh...@gmail.com> wrote:
> > On 8/26/05, Ivan Zhakov <ch...@gmail.com> wrote:
> > > On 8/26/05, Erik Huelsmann <eh...@gmail.com> wrote:
> > > > On 8/23/05, Ivan Zhakov <ch...@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?
Thanks!
bye,
Erik.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] branches/wc-replacements: write relative path in working copy log
Posted by Ivan Zhakov <ch...@gmail.com>.
On 8/26/05, Erik Huelsmann <eh...@gmail.com> wrote:
> On 8/26/05, Ivan Zhakov <ch...@gmail.com> wrote:
> > On 8/26/05, Erik Huelsmann <eh...@gmail.com> wrote:
> > > On 8/23/05, Ivan Zhakov <ch...@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.
]]
--
Ivan Zhakov
Re: [PATCH] branches/wc-replacements: write relative path in working copy log
Posted by Erik Huelsmann <eh...@gmail.com>.
On 8/26/05, Ivan Zhakov <ch...@gmail.com> wrote:
> On 8/26/05, Erik Huelsmann <eh...@gmail.com> wrote:
> > On 8/23/05, Ivan Zhakov <ch...@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?
Thanks!
bye,
Erik.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] branches/wc-replacements: write relative path in working copy log
Posted by Ivan Zhakov <ch...@gmail.com>.
On 8/26/05, Erik Huelsmann <eh...@gmail.com> wrote:
> On 8/23/05, Ivan Zhakov <ch...@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
--
Ivan Zhakov
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] branches/wc-replacements: write relative path in working copy log
Posted by Erik Huelsmann <eh...@gmail.com>.
On 8/23/05, Ivan Zhakov <ch...@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?
Thanks!
bye,
Erik.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] branches/wc-replacements: write relative path in working copy log
Posted by kf...@collab.net.
Ivan Zhakov <ch...@gmail.com> writes:
> Karl,
> I know this practice of course. But wc-replacements branch is "feature
> development" branch. This branch created by Ben Resser for fix replace
> from copy operations. Now Erik Huelsman and I working on it. After
> feature have been completed, branch should be merged to trunk.
> Therefore I post patches to branch.
Thanks for the explanation, now I understand. Good luck!
-Karl
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] branches/wc-replacements: write relative path in working copy log
Posted by Ivan Zhakov <ch...@gmail.com>.
On 23 Aug 2005 12:56:40 -0500, kfogel@collab.net <kf...@collab.net> wrote:
> Ivan Zhakov <ch...@gmail.com> writes:
> > 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.
> > ]]
>
> Is this applicable only to the wc-replacements branch and not to trunk?
>
> Our usual preference is to apply patches to trunk and then merge them
> to any branches that need them.
Karl,
I know this practice of course. But wc-replacements branch is "feature
development" branch. This branch created by Ben Resser for fix replace
from copy operations. Now Erik Huelsman and I working on it. After
feature have been completed, branch should be merged to trunk.
Therefore I post patches to branch.
--
Ivan Zhakov
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] branches/wc-replacements: write relative path in working copy log
Posted by kf...@collab.net.
Ivan Zhakov <ch...@gmail.com> writes:
> 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.
> ]]
Is this applicable only to the wc-replacements branch and not to trunk?
Our usual preference is to apply patches to trunk and then merge them
to any branches that need them.
-Karl
--
www.collab.net <> CollabNet | Distributed Development On Demand
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org