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

Re: svn merge skips newly added files

From: Juan Alonso <jalonso_at_art3mis.com>
Date: 2004-02-05 11:45:18 CET

Here is what I did, I still don't see the problem but it is clear to me
that I am doing something wrong:

cd /tmp
mkdir reposdir
mkdir reposdir/trunk
mkdir reposdir/branches
touch reposdir/trunk/foo
svnadmin create repos
cd reposdir/
svn import -m "initial import" . file:///tmp/repos
cd ..
svn co file:///tmp/repos/trunk wc_trunk
svn cp file:///tmp/repos/trunk file:///tmp/repos/branches/1.0 -m ""
touch wc_trunk/bar
cd wc_trunk/
svn add bar
svn ci -m ""
cd ..
svn co file:///tmp/repos/branches/1.0 wc_branch_1.0
touch wc_trunk/doodaa
cd wc_trunk/
svn add doodaa
svn ci -m ""
cd ..
cd wc_branch_1.0/
svn merge file:///tmp/repos/trunk file:///tmp/repos/branches/1.0

Message I get:
Skipped missing target: bar
Skipped missing target: doodaa

$ /tmp/wc_branch_1.0$ svn --version
svn, version 0.33.0 (r7737)

Maybe the root of the problem is my old svn version?

John Szakmeister wrote:

> The files should definitely be added. If you aren't seeing that happen then
> you've either found a bug, or it's a carbon-based error. :-) I did a quick
> check on my machine with a few files and made merge both delete and add files
> as a result of a merge (using svn 0.37.0).
> If you think you're doing everything correctly, show us a transcript that
> makes the merge fail to add the new files. This way we can reproduce it and
> track down the problem.

Juan Alonso Hernández
Jefe de Desarrollo y Sistemas
www.art3mis.com | (34) 91 530 16 33
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Feb 5 11:45:40 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.