Subversion: compare with rev in another branch

We have this situation: we branch the trunk and continue developing in
the trunk and the branch. At some point we want to push some (but not
all) changes from the branch to the trunk. With CVS we used to just
compare the two versions of the file and select the changes we want to
migrate.

How can we do this with subversion?

If I select a file in the trunk and choose "Compare with..." the list of
revisions that are in the popup do not include any changes from the
branch. Is there something fundamental that I'm missing here?

Thanks,
Cory

1 comment
Comment actions Permalink

Hello Cory,

We have this situation: we branch the trunk and continue developing in
the trunk and the branch. At some point we want to push some (but not
all) changes from the branch to the trunk. With CVS we used to just
compare the two versions of the file and select the changes we want to
migrate.

How can we do this with subversion?

If I select a file in the trunk and choose "Compare with..." the list
of revisions that are in the popup do not include any changes from the
branch. Is there something fundamental that I'm missing here?


"Compare with Branch" action for Subversion has been added in Selena. You
can get the latest Selena EAP build from http://www.jetbrains.net/confluence/display/IDEADEV/Selena+EAP.

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


0

Please sign in to leave a comment.