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

Re: svn_load_dirs.pl on win32

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2004-02-24 21:35:26 CET

On Tue, 2004-02-24 at 14:29, Perry E. Metzger wrote:

> How would you do this? I've never successfully imported a tree in the
> same place twice -- I get weird error messages when I do it. (I
> assumed that it was just the system's way of telling me I was not
> supposed to use import twice for the same sources...)

'svn import' won't overwrite anything in the repository, and neither
will 'svn cp'. Sorry about that, it was a deliberate decision.

Here's the algorithm I was describing:

$ svn import vendor-1.0/ http://host/vendor/vendor-1.0

$ svn cp http://host/vendor/vendor-1.0 http://host/myproject

# weeks go by, I make small changes to 'myproject'.
# vendor releases new version.

$ svn import vendor-1.1/ http://host/vendor/vendor-1.1

# now we have two unrelated trees in the repository. no big deal.

$ svn checkout http://host/myproject
$ cd myproject
$ svn merge --ignore-ancestry \
       http://host/vendor/vendor-1.0 http://host/vendor/vendor-1.1 .

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Feb 24 21:39:30 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.