0

I am attempting to merge changes from a Subversion branch into the trunk, using IntelliJ IDEA (version 2017.1).

My current workspace is the trunk, and I used the instructions found here. But when I select the branch to merge, I get this message below.

You are going to reintegrate changes. This will make branch no longer usable for further work. It will not be able to correctly absorb new trunk changes nor can this branch be properly reintegrated to trunk again.

Normally I can do merged like this without any problem, using the subversion command line, and I continue to add changes to a branch and merge again multiple time, without any trouble.

Why is IntelliJ telling me that the branch will be unusable after this merge? Is this a limitation of IntelliJ, or will it actually mess up my subversion branch in some way? Does IntelliJ's subversion client not support svn mergeinfo metadata feature, which was added in subversion 1.8? (my workspace format is version 1.8)

Community
  • 1
  • 1
GreenGiant
  • 4,930
  • 1
  • 46
  • 76
  • 1
    There's a four-year-old [open issue](https://youtrack.jetbrains.com/issue/IDEA-81096) on this at Jetbrains. It looks like it's not very common and they haven't been able to reproduce it. I would try checking out a second copy of trunk somewhere and doing the merge with the command line (or Tortoise, since it looks like you're on Windows). – David Moles Mar 02 '17 at 18:13
  • 1
    Also, check your Subversion settings and make sure IDEA's using the command line client, as specified in the docs [here](https://www.jetbrains.com/help/idea/2016.3/using-subversion-integration.html). I think the pure-Java client only supports <= 1.7. – David Moles Mar 02 '17 at 18:15
  • Thanks for the info. I am using the command line client, so presumably svn will set the mergeinfo metadata appropriately, despite what the message above says. – GreenGiant Mar 02 '17 at 18:31

1 Answers1

0

IntelliJ seems to be reintegrating:

svn merge --reintegrate

The message is a recommendation from svn's manual:

Once a --reintegrate merge is done from branch to trunk, the branch is no longer usable for further work. It's not able to correctly absorb new trunk changes, nor can it be properly reintegrated to trunk again.

Basic Merging

The issue here is why IntelliJ tries to --reintegrate automatically, even if that's not what the user wants.

Michele Mazza
  • 1
  • 1