Re: merge

On Oct 17, 2007, at 14:31, ion wrote:

> I'm in a branch wc
>
> svn diff shows that a file on the branch has been modified.
> when try to merge it into the trunk, it returns with nothing and no
> merge is done.
>
> If someone can lend me a pointer, I will truly appreciate it...

If you want to merge something into the trunk, you'll need to be in a
trunk wc, not a branch wc.

Please provide more information. What version of Subversion? What OS?
What exact commands did you execute?

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Oct 17 23:06:04 2007