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

Re: Merging confuses renamed files

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2003-08-23 03:48:39 CEST

Philip Martin <philip@codematters.co.uk> writes:

> Here is an example
>
> $ svnadmin create repo
> $ svn mkdir -m "" file://`pwd`/repo/foo
> $ svn import -m "" svn-config file://`pwd`/repo/foo/bar
> $ svn cp -m "" file://`pwd`/repo/foo file://`pwd`/repo/foo2
> $ svn rm -m "" file://`pwd`/repo/foo2/bar
> $ svn import -m "" Makefile file://`pwd`/repo/foo/bar

Oops, that last one should be foo2 not foo

   $ svn import -m "" Makefile file://`pwd`/repo/foo2/bar

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Aug 23 03:49:34 2003

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

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