[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

some issues with my merge

From: Craig White <craig_at_tobyhouse.com>
Date: 2007-01-17 17:27:54 CET

I merged a lot of code from a branch I started months ago into my main
trunk. It all looked good on the dry run and I performed for real. I
then checked out from my main trunk and there are clearly some files and
folders missing in my main trunk that are in the branch and clearly were
within the range of revisions that I merged.

So if I update my local copy of a trunk with the missing files/folders
from my last branch, each folder has a '.svn' directory which has to be
purged before/after copying because if I don't purge it, it says that
the files are already under version control.

So I'm wondering if there is a simpler way to get this missing files
into my trunk.

Craig White <craig@tobyhouse.com>
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jan 17 17:28:31 2007

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.