Here's screenshots of the two following commands, with the code redacted for work-reasons. It basically reimplements the svn diff using just svn cat and regular diff to take into account the revision and line numbers, tracking exactly where in the history a given line was removed.Įven takes into account whether the files are in different branches and displays it as svn would. Tested to work with the outputs of diff (fedora 27), svn info (1.10.2) on my system, YMMV (but for all my effort I hope not that much!). I added comments as an explanation, so I wont get into it here. #remove the note that we now need to show the context because of this #can just print this but you wont get deleted revision/blame
#if not, then one of these revisions is in another branch Example: Beyond Compare help describes a user setting timezone differences ignores timestamp differences that are multiples of an exact hour.
#Beyond compare svn update
Zip files and other archive types can be expanded in-place to compare and update their contents, as easily as any other folder. Fast, with a native look and feel, and enhanced for each platform with the power to do everything you need it to. By default, it is C:Program FilesDevartCode. I suspect the only way to implement something to do this is to inspect each and every commit between the two revisions being compared (and somehow map all the changes in the separate diffs to lines in the total diff).ĭoes there exist a tool that does something like that? Beyond Compare is available wherever you are, on Windows, Linux, and now macOS. Note: Use your product installation folder instead of InstallationDir. It's also not a matter of doing annotate on a revision in the past: We're not interested in who originally added the line that got removed (that's not the one who "caused" the diff), we want to know who removed it. annotate for example will never show you who removed a line. It's not just a matter of "quickly" writing a shell script combining the output of svn diff and svn annotate. The context, lines around it which haven't changed, may be included as well or not, doesn't matter. Can you add annotate/blame-alike information to svn diff, so that for every changed line it includes which user and revision changed that line?įor example, an annotate-diff comparing revisions 8-10 could output something like: 9 user1 - some line that user1 deleted in revision 9ġ0 user2 + some line that user2 added in revision 10
0 kommentar(er)
