CODEWITHSUNDEEP
svnmergesubclipsecollabnet
Morgan Courbet
Morgan Courbet

Reputation: 901

Absent revision during a merge with the Eclipse CollabNet Merge client

I am trying to port a revision commited in a branch A to a branch B.

Here is the history of the branch A (r10629 is the revision I want to port to branch B):

History of the branch A

Usually, I merge the branches with the CollabNet Merge client in Eclipse (right click on the branch B project > Team > Merge...) by selecting the revisions I want to integrate.

Step 1 Step 2 Step 3

As you can see in the last screenshot, the revision 10629 is not displayed, unlike the others. What is wrong?

Upvotes: 0

Views: 667

Answers (1)

Mark Phippard
Mark Phippard

Reputation: 10419

Subversion has an API that is called here to determine what revisions are eligible to be merged. From the command line, it would be something like:

$ svn mergeinfo --show-revs=eligible ^/branches/branchname .

The equivalent API for this command is used by the merge client to populate this display. So yes the answer in the comments by @LazyBadger covers it. The fact that you did not see the revision is a sign that it had already been merged (or the revision touched a different branch then you thought).

Upvotes: 1

Related Questions