You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Greg Stein <gs...@gmail.com> on 2008/10/06 15:47:00 UTC
Re: svn commit: r33483 - in branches/1.5.x: . subversion/bindings/swig tools/po
Why are the properties on CHANGES, COMMITTERS, and bindings/swig
always changing in these merges? Is there anything that can be done
about these (spurious?) notifications?
On Mon, Oct 6, 2008 at 8:05 AM, <hw...@tigris.org> wrote:
> Author: hwright
> Date: Mon Oct 6 08:05:55 2008
> New Revision: 33483
>
> Log:
> Merge r32771 from trunk:
>
> * r32771
> po-update.sh: Search for messages in svn_fs_util.h.
> Justification:
> po-update.sh without this change doesn't add messages from svn_fs_util.h
> to .po files, so these messages are untranslated.
> Votes:
> +1: arfrever, gstein, hwright
>
> Modified:
> branches/1.5.x/ (props changed)
> branches/1.5.x/CHANGES (props changed)
> branches/1.5.x/COMMITTERS (props changed)
> branches/1.5.x/STATUS
> branches/1.5.x/subversion/bindings/swig/ (props changed)
> branches/1.5.x/tools/po/po-update.sh
>
> Merged:
> /trunk:r32771
>
> Modified: branches/1.5.x/STATUS
> URL: http://svn.collab.net/viewvc/svn/branches/1.5.x/STATUS?pathrev=33483&r1=33482&r2=33483
> ==============================================================================
> --- branches/1.5.x/STATUS Mon Oct 6 08:05:09 2008 (r33482)
> +++ branches/1.5.x/STATUS Mon Oct 6 08:05:55 2008 (r33483)
> @@ -81,14 +81,6 @@ Candidate changes for 1.5.3:
> Approved changes:
> =================
>
> - * r32771
> - po-update.sh: Search for messages in svn_fs_util.h.
> - Justification:
> - po-update.sh without this change doesn't add messages from svn_fs_util.h
> - to .po files, so these messages are untranslated.
> - Votes:
> - +1: arfrever, gstein, hwright
> -
> * r33136, r33137
> Fix issue #3285 - 'svn log -g' mistakes property change for
> mergeinfo removal.
>
> Modified: branches/1.5.x/tools/po/po-update.sh
> URL: http://svn.collab.net/viewvc/svn/branches/1.5.x/tools/po/po-update.sh?pathrev=33483&r1=33482&r2=33483
> ==============================================================================
> --- branches/1.5.x/tools/po/po-update.sh Mon Oct 6 08:05:09 2008 (r33482)
> +++ branches/1.5.x/tools/po/po-update.sh Mon Oct 6 08:05:55 2008 (r33483)
> @@ -37,7 +37,8 @@ make_pot()
> -name tests -prune -or \
> -name bindings -prune -or \
> -name "*.c" -print -or \
> - -name "svn_error_codes.h" -print | \
> + -name "svn_error_codes.h" -print -or \
> + -name "svn_fs_util.h" -print | \
> $XGETTEXT --sort-by-file -k_ -kN_ -kSVN_ERRDEF:3 \
> --flag=_:1:pass-c-format \
> --flag=N_:1:pass-c-format \
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: svn-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: svn-help@subversion.tigris.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: r33483 - in branches/1.5.x: .
subversion/bindings/swig tools/po
Posted by Peter Samuelson <pe...@p12n.org>.
[Greg Stein]
> Why are the properties on CHANGES, COMMITTERS, and bindings/swig
> always changing in these merges? Is there anything that can be done
> about these (spurious?) notifications?
That's svn:mergeinfo. Since merge tracking is at file granularity, if
you ever do a merge operation on anything other than the root of a
branch, the file or directory in question gets its own copy of
svn:mergeinfo, which then must be kept up to date until the end of
time.
If you don't want the clutter and overhead, you have to make a habit of
merging only from/to the root of a branch. And remember to 'svn
propdel svn:mergeinfo filename' after every 'svn cp' or 'svn mv'.
--
Peter Samuelson | org-tld!p12n!peter | http://p12n.org/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org