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

Subversion replaces new files instead of adding them after a merge

From: Giulio Troccoli <Giulio.Troccoli_at_uk.linedata.com>
Date: Mon, 16 Jun 2008 12:03:27 +0100

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

I have added a directory and a file in it in a branch and committed.
When I merge those changes into the trunk and commit everything is fine
(i.e. the commit succeed) but it looks like Subversion is replacing the
new file instead of simply adding it.

Here is what I did

ln1sub01 branches> mkdir english
ln1sub01 branches> cp italian/foo.c english
ln1sub01 branches> svn add english
A english
A english/foo.c
ln1sub01 branches> svn st
A english
A english/foo.c
ln1sub01 branches> svn ci -m"Adding English"
Adding branches/english
Adding branches/english/foo.c
Transmitting file data .
Committed revision 12.

ln1sub01 branches> cd ..
ln1sub01 branches> svn merge --change 12
http://localhost/svn-test/branches trunk
A trunk/english
A trunk/english/foo.c
ln1sub01 svn-test> svn st
A + trunk/english
A + trunk/english/foo.c
ln1sub01 svn-test> svn ci -m"Merging revision 12 to trunk"
Adding trunk/english
Adding trunk/english/foo.c

Committed revision 13.

ln1sub01 svn-test> svnlook changed -r 13 /data/TestRepositories/svn-test
A trunk/english/
D trunk/english/foo.c
A trunk/english/foo.c
ln1sub01 svn-test> svn log -r 13 -v
r13 | gtroccol | 2008-06-16 11:50:27 +0100 (Mon, 16 Jun 2008) | 1 line
Changed paths:
   A /trunk/english (from /branches/english:12)
   R /trunk/english/foo.c (from /branches/english/foo.c:12)

Merging revision 12 to trunk

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

I'm using SVN 1.4.4 (client and server) on Linux

Linedata Services (UK) Ltd
Registered Office: Bishopsgate Court, 4-12 Norton Folgate, London, E1 6DB
Registered in England and Wales No 3027851 VAT Reg No 778499447

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 13:04:58 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.