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

Re: Subversion replaces new files instead of adding them after a merge

From: Andreas Schweigstill <andreas_at_schweigstill.de>
Date: Mon, 16 Jun 2008 14:02:13 +0200


Giulio Troccoli schrieb:
> I have a very strange behaviour from Subversion that is *really* not
> what I expected (and I also think it's not right).

No, Subversion behaves absolutely correct. You have to keep in mind
that two files with the same name are different files if they do not
have a common ancestor, even when both files are stored in the same
directory. Look into the Subversion documentation for "peg revision".

> Here is what I did
> ln1sub01 branches> mkdir english
> ln1sub01 branches> cp italian/foo.c english
> ln1sub01 branches> svn add english

Much better would have been:

svn mkdir english
svn cp italian/foo.c english

svn ci -m"Adding English, based on Italian"

> Why is Subversion replacing /trunk/english/foo.c instead of adding it?

It seems that there had been a file /trunk/english/foo.c before your
merge. And that file had nothing to do with the file you created
afterwards. If you do a "svn log" on the new file you also won't find
a hint about the old foo.c because it is based on a different peg

Andreas Schweigstill

Dipl.-Phys. Andreas Schweigstill
Schweigstill IT | Embedded Systems
Schauenburgerstraße 116, D-24118 Kiel, Germany
Phone: (+49) 431 5606-435, Fax: (+49) 431 5606-436
Mobile: (+49) 171 6921973, Web: http://www.schweigstill.de/
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-06-16 14:12:19 CEST

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.