|
|
|
Re: Cannot merge [message #515912 is a reply to message #515222] |
Mon, 22 February 2010 08:41 |
Igor Burilo Messages: 435 Registered: July 2009 |
Senior Member |
|
|
Hello,
It's difficult to say what the problem could be, please, try the following:
- try to make merge not on specific folder but on project root and see the
results. Note that you can always revert changes after merge so it's not
dangerous operation.
- please, see output in SVN Console view (I described in my previous comment
how to customize it) and verify whether there were real changes in those
revision range at interested folder
> Thanks for your reply, Igor.
>
> I have tried to use the URL pointing to the corresponding folder in branch
> B. But it still says "Merge: no changes found".
>
> Let me try to be a little bit specific:
>
> I checked out svn://localhost:12345/zodiac/branches/A as a project to
> workspace#1.
>
> I checked out svn://localhost:12345/zodiac/branches/B as a project to
> another workspace, say #2.
>
> Then, I highlighted a folder in the project in workspace #1, say
> "project/x/y/z" and hit "team->merge"->URL:
> svn://localhost:12345/zodiac/branches/B/x/y/z
>
> Then, I clicked "preview", but there is nothing (besides the header).
>
> Any idea?
>
> Thanks in advance.
|
|
|
|
|
Powered by
FUDForum. Page generated in 0.02552 seconds