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

Re: Merging vendor drop with new subdirectory

From: Kenneth Porter <shiva_at_sewingwitch.com>
Date: 2004-08-26 19:34:24 CEST

--On Thursday, August 26, 2004 12:21 PM -0500 Ben Collins-Sussman
<sussman@collab.net> wrote:

> Show us a transcript of these actions.

Not sure what I can provide at this point, but the sequence was something
like this:

# Back at the beginning of the month
svn co https://server/repos/project/vendor/current
# Pull latest vendor code with VSS and check in
svn commit -m "snapshot 20040805"
svn copy https://server/repos/project/vendor/current \
    https://server/repos/project/vendor/20040805 -m "tag snapshot 20040805"
# This week, pull another VSS snapshot into WC, has new subdirectory
svn commit -m "snapshot 20040825"
svn copy https://server/repos/project/vendor/current \
    https://server/repos/project/vendor/20040825 -m "tag snapshot 20040825"
# Now merge to my own code, which was copied from the initial vendor drop
# updated on the previous drop
cd ~/project/topdir
svn merge https://server/repos/project/vendor/20040805 \
    https://server/repos/project/vendor/20040825 .
# This is where it adds the new files, but reports that it's skipped the
# new subdirectories containing them.

I hadn't paid close attention before but all the new files in the new
subdirectory are reported as added. So it appears to be just the
directories themselves that are getting "skipped".

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Aug 26 19:35:00 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.