Using Merge Info

Hi,

I'm using IDEA #9647 with SVN client 1.5.4 and SVN server 1.5.1. All working copies are 1.5 format.

I'm trying to use the new Merge Info feature for the first time to merge release branches bug fixes back to the trunk of their respective project.
I can't get it working really.

The From side is the release branch with bug fixes.
The To side is the trunk of the project, the working copy is the working copy of the trunk.

To begin with, I get inconsistent behavior on two different projects that have been branched exactly the same way.
On one project, I've got all the revisions since the branching highlighted as Not Integrated.
Whereas on another project, I've got all the revisions prior to the branching highlighted as Not Integrated and all the further revision highlighted as Unknown (question mark icon)

Then, while reviewing revisions, I want to exclude some that don't need to get integrated. Mark As Merged seem to be the feature to use (status bar says 'Mark selected revision as merged, but do not actually merge').
But when I try that on one of more revisions, it's actually trying to merge something and commit something. Is it the expected behavior? Are there cases where it would actually have to merge something?
It actually triggers a Mark as Merge dialog box that has the 'Try merge, but make no change' option, which is quite confusing with the status bar message.
It anyways open the commit dialog after that and whether you choose to commit or not, the revision never seem to be marked as merged.
I'm getting a red Mixed Revision Working Copy message after refreshing.

Integrate to Branch seems to do exactly the same as Mark as Merge. Even after a commit, the revisions keep the same status (Not Integrated or Unknown depending on project)

What am I doing wrong here?
Thanks for any help.
-nodje

1 comment
Comment actions Permalink

I should probably mention on which SVN repository structure I'm working on.

We have
/trunk
          /project1
          /projectN
/branches
          /project1-1.0
/tags

which i suspect could cause problems.
I think IDEA expect a structure like this:
/project1
          /trunk
          /branches
          /tags
/projectN
          /trunk
          /branches
          /tags

Theorically since you specify the From and the To, it shouldn't matter, but it feels you have to play around with the Select Branch dialog to get it working with our SVN structure.

Is there an expected structure?

0

Please sign in to leave a comment.