You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by David Glasser <gl...@davidglasser.net> on 2008/04/09 17:49:28 UTC
Re: svn commit: r30455 - in trunk/subversion: svn tests/cmdline
This commit makes log tests 16 through 19 and blame tests 10 and 11
fail for me (over ra_local, say) when they run svn merge with errors
like
subversion/libsvn_client/merge.c:2146: (apr_err=155015)
svn: One or more conflicts were produced while merging r3:6 into
'.' --
resolve all conflicts and rerun the merge to apply the remaining
unmerged revisions
--dave
On Wed, Apr 9, 2008 at 10:17 AM, <cm...@tigris.org> wrote:
> Author: cmpilato
> Date: Wed Apr 9 10:17:22 2008
> New Revision: 30455
>
> Log:
> Make 'svn merge' pick a sane default operative revision range when a
> peg revision is actually supplied to the single-URL form of the
> command (1:PEG_REV, instead of 1:HEAD).
>
> * subversion/svn/main.c
> (svn_cl__cmd_table): Tweak usage message for 'svn merge'.
>
> * subversion/svn/merge-cmd.c
> (svn_cl__merge): Set the default youngest revision in the operative
> range from the (specified, or default) peg revision.
>
> * subversion/tests/cmdline/merge_tests.py
> (merge_with_implicit_target_helper): Test the new behavior appropriately.
>
> Modified:
> trunk/subversion/svn/main.c
> trunk/subversion/svn/merge-cmd.c
> trunk/subversion/tests/cmdline/merge_tests.py
>
> Modified: trunk/subversion/svn/main.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/svn/main.c?pathrev=30455&r1=30454&r2=30455
> ==============================================================================
> --- trunk/subversion/svn/main.c Wed Apr 9 10:15:32 2008 (r30454)
> +++ trunk/subversion/svn/main.c Wed Apr 9 10:17:22 2008 (r30455)
> @@ -607,7 +607,7 @@ const svn_opt_subcommand_desc2_t svn_cl_
> " for each revision range provided. If REV is not specified, HEAD\n"
> " is assumed. '-c M' is equivalent to '-r <M-1>:M', and '-c -M'\n"
> " does the reverse: '-r M:<M-1>'. If no revision ranges are\n"
> - " specified, the default range of 0:HEAD is used. Multiple '-c'\n"
> + " specified, the default range of 0:REV is used. Multiple '-c'\n"
> " and/or '-r' instances may be specified, and mixing of forward\n"
> " and reverse ranges is allowed.\n"
> "\n"
>
> Modified: trunk/subversion/svn/merge-cmd.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/svn/merge-cmd.c?pathrev=30455&r1=30454&r2=30455
> ==============================================================================
> --- trunk/subversion/svn/merge-cmd.c Wed Apr 9 10:15:32 2008 (r30454)
> +++ trunk/subversion/svn/merge-cmd.c Wed Apr 9 10:17:22 2008 (r30455)
> @@ -281,7 +281,7 @@ svn_cl__merge(apr_getopt_t *os,
> ranges_to_merge = apr_array_make(pool, 1, sizeof(range));
> range->start.kind = svn_opt_revision_number;
> range->start.value.number = 1;
> - range->end.kind = svn_opt_revision_head;
> + range->end = peg_revision1;
> APR_ARRAY_PUSH(ranges_to_merge, svn_opt_revision_range_t *) = range;
> }
>
>
> Modified: trunk/subversion/tests/cmdline/merge_tests.py
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/tests/cmdline/merge_tests.py?pathrev=30455&r1=30454&r2=30455
> ==============================================================================
> --- trunk/subversion/tests/cmdline/merge_tests.py Wed Apr 9 10:15:32 2008 (r30454)
> +++ trunk/subversion/tests/cmdline/merge_tests.py Wed Apr 9 10:17:22 2008 (r30455)
> @@ -1328,11 +1328,15 @@ def merge_with_implicit_target_helper(sb
> 'merge', '-c', '2', 'mu')
>
> elif arg_flav == '*':
> + # Without a peg revision, the default merge range of BASE:1 (which
> + # is a no-op) will be chosen. Let's do it both ways (no-op first,
> + # of course).
> + svntest.actions.run_and_verify_svn(None, None, [], 'merge', 'mu')
> svntest.actions.run_and_verify_svn(None,
> expected_merge_output([[2]],
> 'U mu\n'),
> [],
> - 'merge', 'mu')
> + 'merge', 'mu@2')
>
> # sanity-check resulting file
> if (svntest.tree.get_text('mu') != orig_mu_text + added_mu_text):
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: svn-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: svn-help@subversion.tigris.org
>
>
--
David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: r30455 - in trunk/subversion: svn tests/cmdline
Posted by "C. Michael Pilato" <cm...@collab.net>.
David Glasser wrote:
> This commit makes log tests 16 through 19 and blame tests 10 and 11
> fail for me (over ra_local, say) when they run svn merge with errors
> like
>
> subversion/libsvn_client/merge.c:2146: (apr_err=155015)
> svn: One or more conflicts were produced while merging r3:6 into
> '.' --
> resolve all conflicts and rerun the merge to apply the remaining
> unmerged revisions
Sorry about that. I ran the merge_tests only before committing. Fixed in
r30460.
--
C. Michael Pilato <cm...@collab.net>
CollabNet <> www.collab.net <> Distributed Development On Demand