Re: [PATCH][merge-tracking]merge --record-only should be no-op in dry-run mode

On Thu, 25 Jan 2007, Kamesh Jayachandran wrote:
...
> >Without this patch --record-only along with --dry-run spits out like
> >the following,
> ><snip>
> >../subversion/libsvn_wc/lock.c:1397: (apr_err=155005)
> >svn: No write-lock in '.'
> ></snip>
> >
> >With regards
> >Kamesh Jayachandran
> >
> >---------------------------------------------------------------------
> >To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> >For additional commands, e-mail: dev-help@subversion.tigris.org
> >
>

> [[[
> The --record-only switch should not record anything in dry-run mode.
>
> * subversion/libsvn_client/diff.c
> (do_merge, do_single_file_merge): As mentioned in the above summary.
>
> Patch by: kameshj
> ]]]

I've commited this patch with some tweaks to the merge-tracking branch
as r23283.