Re: Could merging be any more cumbersome?

On Aug 5, 2005, at 3:28 PM, Rick Mann wrote:

>
> ----------------------------------------------------------------------
> --
> r11586 | rmann | 2005-08-04 18:05:02 -0700 (Thu, 04 Aug 2005) | 2
> lines
> Changed paths:
> A /branches/relaunch/db/test

So yes, test/ was added in r11586. If you then tell 'svn merge' to
compare r11586 with HEAD, you *won't* get the directory added to your
working copy. It already exists in both snapshots, right? You need
to use r11585 as your 'left' snapshot.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Aug 6 15:08:11 2005