te:
From: Jeremy Mordkoff
Subject: RE: Merging branch back to trunk omits dirs and files that were added
in the branch
To: "Dean Schulze" , users@subversion.apache.org
Date: Tuesday, June 1, 2010, 1:35 PM
Sounds like the target directories already existed in trunk. How did they
ailto:j...@zeevee.com>
www.zeevee.com <http://www.zeevee.com/>
From: Dean Schulze [mailto:dean_w_schu...@yahoo.com]
Sent: Tuesday, June 01, 2010 2:48 PM
To: users@subversion.apache.org
Subject: Merging branch back to trunk omits dirs and files that were
added in the branch
I
I've tried this with both TortoiseSVN and the merge tool that comes with
Subclipse.
I've added subdirectories with files under several directories on the branch
(along with many other changes). When I merge back to the trunk the top level
directories under which I added the subdirectories and