[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: John Szakmeister <john_at_szakmeister.net>
Date: 2004-02-05 12:08:48 CET

On Thursday 05 February 2004 05:45, Juan Alonso wrote:
> 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

If I understand your script correctly, you're trying to merge change from
trunk/ into branches/1.0/. If that's the case, then you're arguments to
merge are incorrect. It should read:

svn merge file:///tmp/repos/branches/1.0 file:///tmp/repos/trunk

When I do this I get the following:
A bar
A doodaa

Merge works much the same way diff does. It looks at the first argument as a
base, and then creates a patch to make it look like the second argument.
Then it applies the patch to the working copy. With the merge command you
provided, it created a patch using trunk/ as the base, and branches/1.0/ as
the target. In this case, that would mean *removing* 'bar' and 'doodaa'.
The message that you got below is Subversion saying, "Hey, this file is
missing, so I'm not applying any changes to it." It's missing because it was
never there in the first place. :-) You should take a look at the book, as
it describes how to do these sorts of things very well:

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

No, I don't think so. However, I would recommend upgrading. There have been
a lot of bugs fixed since 0.33.0.


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Feb 5 12:10:31 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.