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

svn merge doing nothing about manually merged file

From: Cecile <rubycoder_at_gmail.com>
Date: 2006-12-26 09:05:52 CET

Hi,

I have a private branch, "branch1" in which I've added a new file
namely "TransactionType.java".
Being a novice at subversion, I blindly copied this file back to the
trunk and checked it in.

Now I'm trying to merge correctly using svn merge.

So I went to the trunk and firstly deleted the file from the trunk.

trunk$ svn delete TransactionType.java

When I ran the merge like this, it doesn't add the TransactionType.java

trunk$ svn merge -r 20522:HEAD https://myserver/branches/branch1

That is to say, I was expecting something like this:

A TransactionType.java

What's wrong? How can I correct this ? Thanks to all.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Dec 26 09:06:08 2006

This is an archived mail posted to the Subversion Users mailing list.