Very slow merge for Feature Branch

Hello all,

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.feature).
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.
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?

Thanks

---------------------------------------------------------------------
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-30 22:58:38 CET