Re: Very slow merge for Feature Branch

On Jan 30, 2008, at 15:58, Stephen Armstrong wrote:

> Our company uses developer branches much like the practice of
> Feature Branches described in the svn book (http://svnbook.red-
> bean.com/en/1.4/
> svn.branchmerge.commonuses.html#svn.branchmerge.commonuses.patterns.fe
> ature). We've been noticing that merges are taking quite a while on
> some larger projects (15 - 20 min), regardless of how many changes
> were made.

That seems to be a long time, but what is "larger"? How many files
and directories are we talking about? How much space on disk does a
working copy consume?

> Because of other practices, we've always got a working copy of our
> branch, and of the trunk on disk, but we can't do the merge with a
> command such as:
>
> merge ./trunk ./branch ./trunk
>
> It seems that when specifying a working copy for the merge, it only
> uses it like an anchor, to get the URL for the repo. Is there a way
> we can do the merge client-side? Some kind of offline-merge?

I don't think you can use local working copies to do the merge.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-01-31 08:10:22 CET