No changes in merge [message #23023] |
Sun, 29 June 2008 13:19 |
No real name Messages: 25 Registered: July 2009 |
Junior Member |
|
|
I've just updated to Eclipse 3.4 on Linux and updated the plugins to 2.0.1.
When I try to merge a branch with the trunk, I get no differences. I
have confirmed that there are differences by checking out the trunk and
branch into separate directories and doing a diff -r.
In the preferences for SVN connector, I choose "SVN kit (SVNKit 1.2.0
development (http://svnkit.com/) r4310)".
I use a svn hosting company for the repository and they are using SVN
1.4. Locally I have v1.4.6 of the svn client commandline utilities.
I also deleted project (without deleting the files) and recreated the
project.
What am I doing wrong?
|
|
|
Powered by
FUDForum. Page generated in 0.03074 seconds