| Merge revisions not working [message #45040] |
Tue, 28 April 2009 04:18  |
Eclipse User |
|
|
|
Hi
I'm trying to merge a set of revisions from a branch to trunk, but the
trouble is that Subversive doesn't see any differences between the two.
If I select 'All' or 'Start from copy' it works fine. Also when I merge
select revisions with TortoiseSVN it works fine, but I can't use it as it
breaks the projects in Eclipse (incorrect SVN metadata etc). So far I've
had to resort to making patches from the branch and apply them to the
trunk.
Tried with both JavaHL and SVNKit without luck. I've latest version of
Eclipse and the plugins. SVN version 1.5.
|
|
|
| Re: Merge revisions not working [message #45901 is a reply to message #45040] |
Tue, 05 May 2009 10:56  |
| Eclipse User |
|
|
|
Hello Teijo,
How exactly did you perform merge, i.e. there are three tabs in merge dialog
and what options you selected?
Could you provide detailed steps how to reproduce the problem, e.g. change
file content in branch and make merge in trunk?
What SVN connector, Subversive versions do you use?
> Hi
>
> I'm trying to merge a set of revisions from a branch to trunk, but the
> trouble is that Subversive doesn't see any differences between the two.
>
> If I select 'All' or 'Start from copy' it works fine. Also when I merge
> select revisions with TortoiseSVN it works fine, but I can't use it as it
> breaks the projects in Eclipse (incorrect SVN metadata etc). So far I've
> had to resort to making patches from the branch and apply them to the
> trunk.
>
> Tried with both JavaHL and SVNKit without luck. I've latest version of
> Eclipse and the plugins. SVN version 1.5.
>
|
|
|
Powered by
FUDForum. Page generated in 0.03381 seconds
Home