[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r29377 - trunk/subversion/libsvn_client

From: David Glasser <glasser_at_davidglasser.net>
Date: Fri, 15 Feb 2008 10:09:34 -0800

On Fri, Feb 15, 2008 at 3:34 AM, <kameshj_at_tigris.org> wrote:
> Author: kameshj
> Date: Fri Feb 15 03:34:52 2008
> New Revision: 29377
>
> Log:
> Merge from pre-1.5 repo using 1.5 client
> and cherry pick multiple changesets.
>
> We get the merge notification for only the first changeset
> as it appears in the command line though merge happens for
> all the changesets.
>
> svn co http://svn.collab.net/repos/svn/branches/1.5.x svn_1.5.x
> cd svn_1.5.x
> svn merge -c29185 -c29186 -c29188 http://svn.collab.net/repos/svn/trunk .
> --- Merging r29185 into '.':
> path1
> path2
> ...

Kamesh, good fix.

I found your log message a little confusing. I might have written
something more like:

[[[
Fix notification for merges from pre-1.5 repos using 1.5 client,
cherry-picking multiple changesets.

Before this change, we got the merge notification for only the first
changeset as it appears in the command line, though merge did happen
for all the changesets:

    $ svn co http://svn.collab.net/repos/svn/branches/1.5.x svn_1.5.x
    $ cd svn_1.5.x
    $ svn merge -c29185 -c29186 -c29188 http://svn.collab.net/repos/svn/trunk .
    --- Merging r29185 into '.':
    path1
    path2
    ...

* subversion/...
]]]

That is, describe the change being made, not the bug that used to
exist.

--dave

> * subversion/libsvn_client/merge.c
> (do_directory_merge): Reset notify_b->cur_ancestor_index to -1,
> before each merge drive.
>
> Found by: arfrever
>
>
> Modified:
> trunk/subversion/libsvn_client/merge.c
>
> Modified: trunk/subversion/libsvn_client/merge.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_client/merge.c?pathrev=29377&r1=29376&r2=29377
> ==============================================================================
> --- trunk/subversion/libsvn_client/merge.c (original)
> +++ trunk/subversion/libsvn_client/merge.c Fri Feb 15 03:34:52 2008
> @@ -4396,6 +4396,10 @@
> range.start = revision1;
> range.end = revision2;
> range.inheritable = inheritable;
> + /* Reset cur_ancestor_index to -1 so that subsequent
> + * cherry picked revision ranges will be notified
> + * upon subsequent operative merge. */
> + notify_b->cur_ancestor_index = -1;
>
> SVN_ERR(drive_merge_report_editor(merge_b->target,
> url1, revision1, url2, revision2,
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: svn-unsubscribe_at_subversion.tigris.org
> For additional commands, e-mail: svn-help_at_subversion.tigris.org
>
>

-- 
David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-02-15 19:09:53 CET

This is an archived mail posted to the Subversion Dev mailing list.