[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: Marc Haisenko <haisenko_at_comdasys.com>
Date: Mon, 16 Jun 2008 15:10:43 +0200

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

The important part is the "svn cp". That tells SubVersion that there's a
relation (you also get the complete history on of the old file on your new
file which is almost always something you want: after all, it once was
italian/foo.c and SubVersion now knows that).

Marc Haisenko
Comdasys AG
Rüdesheimer Str. 7
80686 München
Tel.: +49 (0)89 548 433 321
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:11:13 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.