I'm looking to enable extremely verbose logging output in the svn client specifically for the task of resolving botched merges.
The problem I'm facing currently is merging from trunk into my feature branch brings in no new changes, but a diff of the two HEADs reveals outstanding unmerged work.
Generally I'd think this means that the mergeinfo has been messed up, or there is some mergeinfo deeper in the project directory structure that is causing issues. However in this case I've cleaned all the mergeinfo properties and manually ensured the root of the feature branch's mergeinfo does not contain the revisions that are on the head of trunk which I'm attempting to merge in.
For this task and others I'm looking to be able to enable an SVN debug log which literally shows me stuff like:
I was looking at recompiling the svn client with some sort of compile time flags to indicate logging verbosity but was not getting anywhere. Does anyone have any pointers on how to get more information from SVN Client? (command line, linux).
In Apache Subversion, commands are entered via a terminal window. To open this in Windows, press the 'Windows key' and 'r. ' This will bring up the 'Run' dialog box. Enter 'cmd' and hit 'Ok.
If you want to run Subversion commands from the command prompt, you should run the svn.exe command line client. TortoiseSVN 1.6. x and older versions did not include SVN command-line tools, but modern versions do.
Description. Shows log messages from the repository. If no arguments are supplied, svn log shows the log messages for all files and directories inside (and including) the current working directory of your working copy. You can refine the results by specifying a path, one or more revisions, or any combination of the two ...
You can get network debug output with --config-option servers:global:neon-debug-mask=<level>
(see levels here). This won't help with merges and other logic problems (very low level); just pointing it out for the sake of people who are googling for svn client debug output for network problems.
AFAIK, no. --verbose exists but only for svn status
and svn pl
(possibly more, but not merge or update). I can definitely see the need for this, especially if you are messing around with mergeinfo.
It sounds like you know what your doing already but try to run svn pl -v
to see the mergeinfo on the root node.
Also, I've noticed that svn 1.6.6 and earlier have problems with mergeinfo, specifically that it destroys it in certain cases. Upgrade to the latest (on ubuntu 10.04 I've checked out the source using svn, built it and then uninstalled the apt-get version).
Good luck.
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With