How work SVN -> 'Integrate file...' ?

Hi. Sorry, my english is very bad, I speak spanish. I have the 'test' branch and the trunk, in SVN. When I commit a bugfix in trunk, I want to merge (¿integrate?) this change with the test branch. How can I do this? The "Integrate file ..." option, under the Subversion contextual menu doesn't work. It does nothing. How can i merge a change with Subversion?
Thanks

1 comment
Comment actions Permalink

Hello azerazer,

a> Hi. Sorry, my english is very bad, I speak spanish. I have the 'test'
a> branch and the trunk, in SVN. When I commit a bugfix in trunk, I want
a> to merge (¿integrate?) this change with the test branch. How can I do
a> this? The "Integrate file ..." option, under the Subversion
a> contextual menu doesn't work. It does nothing. How can i merge a
a> change with Subversion?

You need to open the project for your test branch, specify the URL of the
trunk in the "Source 1" and "Source 2" fields, and specify the revisions
before and after your fix in the "Revision" fields.

--
Dmitry Jemerov
Software Developer
JetBrains, Inc.
http://www.jetbrains.com/
"Develop with Pleasure!"


0

Please sign in to leave a comment.