Re: merge a huge delta

On 30.08.2005, at 22:17, Chris Curvey wrote:

> [snip] The new directories and all the files were added as part of
> revisions 290 and 291.
>
> Now I'm trying to merge these huge directories back onto my trunk.
> If I do this:
>
> cd working-copy-of-the-trunk/tests
> svn merge -r290:291 http://host/path-to-repository/branches/
> mybranch/tests

Merging -r290:291 will only get you the changes needed to convert
revision 290 into 291. If you also want to get the changes that make
up revision 290, you'll need to merge -r289:291.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Aug 31 00:35:53 2005