Re: svn merge doing nothing about manually merged file

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

Did you run svn commit and svn update of WC after this "delete" operation ?

> 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

Are you doing from inside your WC ?

/Ram

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Dec 26 15:10:07 2006