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

RE: Re: 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 13:17:59 +0100

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

Well, although I don't think doing it your way would have change the
outcome of the merge, if I use svn cp I create a "link" between
italian/foo.co and enlighs/foo.c which I didn't want. As I sain anyway,
I don't think this is relevant to the problem.
> 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
> revision.

I can assure you that that was not the case. /trunk/English is a brand
new directoy, and it was created by the merge and in fact SVN showed a A
as it's status after the merge

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

I will try to write a script that creates a new test repository and
replicates the problem so everybody can run it.

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 14:19:16 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.