[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 14:17:22 +0100

> On Monday 16 June 2008, Giulio Troccoli wrote:
> > ln1sub01 branches> mkdir french
> > ln1sub01 branches> cp italian/foo.c french
> > ln1sub01 branches> svn add french
> Try it this way:
> svn mkdir french (or: mkdir french ; svn add french)
> svn cp italian/foo.c French

Marc, you missed the point. The problem is not whether to retain the
history of the file or not. The problem is that trunk/French did not
exist at all prior to the merging, so how can Subversion replace a file
(trunk/french/foo.c) that did not exist in the first place?

Just out of thoroughness though I tried as you suggested (and as Andreas
suggested too) and the result is the same

ln1sub01 branches> svn mkdir spanish
A spanish
ln1sub01 branches> svn cp italian/foo.c spanish
A spanish/foo.c
ln1sub01 branches> svn ci -m"Adding Spanish"
Adding branches/spanish
Adding branches/spanish/foo.c

Committed revision 18.
ln1sub01 branches> cd ..
ln1sub01 svn-test> svn merge -c18 http://localhost/svn-test/branches
A trunk/spanish
A trunk/spanish/foo.c
ln1sub01 svn-test> svn ci -m"Merging revision 18 to trunk"
Adding trunk/spanish
Adding trunk/spanish/foo.c

Committed revision 19.
ln1sub01 svn-test> svnlook changed -r19 /data/TestRepositories/svn-test
A trunk/spanish/
D trunk/spanish/foo.c
A trunk/spanish/foo.c
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 15:17:48 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.