newbie: confused abt merging checkouts w/ co, up, sw ...

hi all,

i've imported the following dirs into my svn repository (svnrepo):

        svrepo
              |
              |-- master/
              | |--apples/{contents of apples}
              | |--oranges/{contents of oranges}
              |
              |-- dev_apples/{contents of dev_apples}
              |
              |-- dev_oranges/{contents of dev_oranges}

my TARGET goal is to populate (chekcout, update, switch?) repository files into a resultant hierarchy of:

        project_directory
              |
              |-- apples/{contents of apples} + {contents of dev_apples}
              |
              |-- oranges/{contents of oranges} + {contents of dev_oranges}

BUT, i can't figure out how to get there!

my first steps were:

cd project_directory

        svn checkout svn://localhost/svnrepo/master/apples apples/
        svn checkout svn://localhost/svnrepo/master/oranges oranges/

resulting, as expected, in:

        project_directory
              |
              |-- apples/{contents of apples}
              |
              |-- oranges/{contents of oranges}

however, a subsequent attempt to checkout, e.g., the dev_apples/* files INTO the apples/ dir:

        svn checkout svn://localhost/svnrepo/master/dev_apples apples/

fires an error that the dir is already being used.

a try with 'switch':

        svn checkout svn://localhost/svnrepo/master/dev_apples apples/

works, but REPLACES (rather than adds/merges) the the apples/ dir with dev_apples/* files, i.e.:

        project_directory
              |
              |-- apples/{contents of dev_apples}

QUESTION:

       What sequence of svn commands will get me to my TARGET goal?

       Or, do I have to cp/mv/etc. the files into a target dir, from individually svn co'd dirs?

thanks!

richard

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Jan 11 20:01:37 2004