Comments on: Subversion. Easy merge for feature branches

By: Irina Chernushina (JetBrains)

Irina Chernushina (JetBrains) — Mon, 26 Mar 2012 14:25:59 +0000

@James, @Vladimir, @Randell, @Thorsten

It is Subversion limitation, please read here (in the end of subtopic:)

http://svnbook.red-bean.com/en/1.7/svn-book.html#svn.branchemerge.basicmerging.reintegrate

Quotation:

“… 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. For this reason, if you want to keep working on your feature branch, we recommend destroying it and then re-creating it from the trunk:

$ svn delete http://svn.example.com/repos/calc/branches/my-calc-branch \
-m “Remove my-calc-branch, reintegrated with trunk in r391.”
Committed revision 392.

$ svn copy http://svn.example.com/repos/calc/trunk \
http://svn.example.com/repos/calc/branches/my-calc-branch
-m “Recreate my-calc-branch from trunk@HEAD.”
Committed revision 393.
“

By: Thorsten

Thorsten — Mon, 26 Mar 2012 12:11:02 +0000

Same here with PS-117.65 - really annoing…

By: Randell Benavidez

Randell Benavidez — Thu, 09 Feb 2012 07:19:29 +0000

I’m experiencing this very same problem in PhpStorm 3.0.2 #111.296.

By: Vladimir Konkov

Vladimir Konkov — Mon, 12 Dec 2011 15:40:24 +0000

I’ve the same issue as James Crow.
How can I merge bug fixes from relese branch to trunk without closing branch?

Currently I do that by command line…

By: James Crow

James Crow — Wed, 05 Jan 2011 16:52:37 +0000

I use Version Control -> Integrate… with source 1 & source 2 populated as a release branch of our code to merge changes back to the development trunk. This works fine but feel that using the “Merge From” feature would be easier to use.

However, it says the branch will no longer be available after I perform the merge which is fine for feature branches but not for release branches. Is there any way around this or do I need to keep using integrate?

By: Irina

Irina — Fri, 10 Dec 2010 17:10:15 +0000

@Jeppe Please create a ticket (I think it’s better since I need more details)
and please describe what is your copy URL and what is source branch URL, and what settings you have in configure branches

IDEA must 1) know from settings what is your branch URL and how to translate its contents into source URLS (i.e. /root/trunk/subfolder into /root/branches/branch/subfolder)
2) IDEA goes down the history and tries to find the revision when either trunk was copied to branch (or its parent) or vice versa, branch to trunk

Thank you

By: Jeppe

Jeppe — Wed, 08 Dec 2010 14:44:05 +0000

When I try to merge from trunk to my feature branch using the instructions above, Idea complains saying “Merge start wasn’t found”.

What to do? I used Idea’s “create branch” SVN option from I created the branch. What did I miss?

Thanks.

By: Sachin

Sachin — Thu, 04 Nov 2010 14:38:43 +0000

I can attest that SVN integration works great in IDEA. There will always be bugs in any product that you buy in any market. Even Toyota had an accelerator that got stuck to the floor every now and then. Atta boy IDEA.

By: Andy

Andy — Thu, 21 Oct 2010 17:55:34 +0000

I understand JetBrains needs to keep pushing out new features to justify new releases and make money. But in a perfect world where money didnt matter, I could see JetBrains fixing all the bugs and making the product better instead of feature ridden. It’s like Microsoft with Office - how many new features can you (or do you) really want to add to Word or Excel? I mean, enough with the features. Let’s make this thing run like the fastest stable thing out there. However I do love the IDE so nice work.

By: Adam

Adam — Tue, 27 Jul 2010 07:41:28 +0000

I have a question about this merge functionality - does it require any specific SVN version on the server side as we are still stuck on 1.4 on the server?