RE: Re: Very slow merge for Feature Branch

> -----Original Message-----
> From: Stephen Armstrong [mailto:StephenArmstrong_at_nanometrics.ca]
>
-----------------< much history removed >-------------------

> The command we were using is:
>
> svn merge trunk_at_HEAD branch_at_HEAD trunk
>
> Now, according to ancestry, branch has had most of it's files
> modified since it was created months ago. But since last time
> we ran this merge (and so synced all files) we've only
> modified 1 file. It still takes a while (apparently it's only
> 7 min or so. Not 15-20 as I was led to believe), but as I've
> said, a new branch with the same amount of changes seems to
> happen almost instantly. I would assume this is because the
> diff uses ancestry to eliminate any that haven't been
> modified since branch creation and diff those that have.
>
> It looks like getting our users to delete their branch and
> recreate it after merging all finished changes into trunk
> will solve the problem by keeping all branches young.

I suspect your merges are scanning back to the branch point, when that
is not necessary. If I am correct, there are three better solutions.

1) when you merge, identify which revisions were merged in the commit
log. The next time you merge, view that information, and only merge the
revisions that aren't already merged (usually the subsequent ones).

2) Use svnmerge.py, which adds properties to the projects that keep
track of already merged revisions, thus making the merge (potentially)
as easy as "svnmerge merge".

3) Use Subversion 1.5 and the merge tracking feature.

I'm interested in hearing if any of those improve your experience!

--
David
*************************************************************************
This communication, including attachments, is
for the exclusive use of addressee and may contain proprietary,
confidential and/or privileged information.  If you are not the intended
recipient, any use, copying, disclosure, dissemination or distribution is
strictly prohibited.  If you are not the intended recipient, please notify
the sender immediately by return e-mail, delete this communication and
destroy all copies.
*************************************************************************
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org