All geek questions in one place

Tracking SVN Changes Through Multiple Mergers

At work, we use a branching strategy, where all changes begin in the development branch, and then are pushed through one or more integration branches and finally end with the release branch.

Sometimes (more often than I would like) I need to find out where a certain change came from (which branch of development). In this case, I have to spend a considerable amount of time on the detective to trace the change back through 2-3 mergers.

Am I missing an easy way to do this?

+4
source share
1 answer

With subversion 1.5 and above, several commands have the -g option to use megeinfo data to build a more complete view of the history. This requires that you use subversion 1.5 or higher on the server and perform all merges with svn 1.5 or higher.

  • svn log -g
  • svn blame -g

A quick test shows that this does not work flawlessly (I have duplicate history entries on a fairly simple test version), but it may be good enough for what you need.

More on the new mergeinfo property:
http://svnbook.red-bean.com/nightly/en/svn.branchmerge.basicmerging.html

+3
source

Source: https://habr.com/ru/post/1306961/

More articles:


All Articles