merge using svn, how to do it right?

i'm trying to figure out how exactly changes that have been committed into branch x can be merged into the trunk. what i managed to find out was that there is a popup menue at changes -> repository -> pick a line -> right click -> subversion -> integrate to branch. after i did this, the changes were in my other project, but i saw no trace of the merge in the svn history. it was as if i made all the changes manually. according to the idea help, there should be a column which shows the merge sources, but it's not there

8 comments
Comment actions Permalink

Did you commit the results of your merge?

A merge only merges it to a local working copy. The changes still have to be committed to the repository.

0
Comment actions Permalink

yes, i checked the power plug first. the changes are committed, but as i said it looks like i did them manually

0
Comment actions Permalink

Did you do an update on your working copy after you committed? Even after you commit they won't show up in history until you do an update.

0
Comment actions Permalink

no i didn't, why should i need an update? the repository should already know about the merge, right?

0
Comment actions Permalink

From my experience IntelliJ only shows the history up to the revision number of your working copy.

So you need to do an update to get your working copy up to the most recent repository revision number (even if it was your commit that took it to that revision number).

0
Comment actions Permalink

that doesn't make sense. the history should always be complete, no matter which version my local copy has. is it different for subversion?

0
Comment actions Permalink

The history exists in the repository; however, you won't see that history unless you do an update on your working copy (unless you looked at the history directly on the repository).

This is the same behavior you would see if you used "svn log" from the command line. If you did a commit, then immediately did an svn log you wouldn't see your commit in the output until you did an svn update, then run svn log again.

0
Comment actions Permalink

now i did it right. i can right click on the line in the svn history view and there's the option "show merged sources details". but there still is no column showing the merged sources. did it get removed?

0

Please sign in to leave a comment.