[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

svn mergeinfo inconsistencies?

From: Mikael Stålhammar <mikael_stalhammar_at_hotmail.com>
Date: Tue, 3 Sep 2019 07:14:38 +0000

I am having issues identifying what is left to be merged from trunk to a feature branch, without involving a working copy and doing a dry run merge. I thought I could use the "svn mergeinfo" command but it doesn't seem to be completely accurate. Here's my scenario:

The SVN server is 1.8.5

I have a trunk branch and a feature branch.

I have the feature branch sparse checked out since it’s a quite big project.

I want to query the repository for trunk changes eligible to be merged to the feature branch. To do that I use “svn mergeinfo --show-revs eligible <trunk root URL> <branch root URL> --recursive --log -v”.

Now, from the list returned I identified some of the files to be “cherry picked” and merged, i.e. as subtree merges.

I sparse updated my feature branch project to bring those particular files into the working copy.

I merged and committed the cherry picked files to the feature branch, i.e. the files got explicit mergeinfo properties.

The next time I ran that “svn mergeinfo” command from above, I expected to see the files remaining to be merged, without the recently merged and committed ones. However, the list is now empty instead!? How come? What have I missed here? Thanks in advance!

Just as I finished writing this I did another googling and found this:
where I think my issue might be explained. The articles mentioned here are a bit dated though. I wonder what's the current status of this. Does "svn mergeinfo" consider explicit mergeinfo from subtrees in the more recent versions of SVN? Or, is there any other way to identify what needs to be merged from trunk to a feature branch, without involving a working copy (i.e. besides dry running a merge)?



Received on 2019-09-03 09:23:40 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.