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

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

From: OpenMacNews <users-subversion.20.openmacnews_at_spamgourmet.com>
Date: 2004-01-11 20:00:48 CET

hi all,

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

              |-- 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:

              |-- 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:

              |-- 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.:

              |-- apples/{contents of dev_apples}


       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?



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

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.