如何在 Linux 上直观地比较由 SVN 版本的文件夹的两个修订版？

Question

I can compare a current folder state to its latest revision using the following command:

meld .

meld shows a list of changed files. One can click on each file and see a diff.

Is it possible to compare a current folder state to its specific revision (not the latest one)?

TortoiseSVN allows to compare arbitrary revisions, however it works on Windows only. SmartSVN is proprietary. SVN CLI is unusable for big changesets (CLI diff is fine for small commits, but it's very hard to use it for branch comparision with a lot of changes).

Maybe I could checkout the revision to compare into a separate folder and compare two folders using meld . But I guess there should be a simpler approach.

Answer 1

Preface

Question is offtopic here: as already mentioned in comment, it's question for Software Recommendations site

Face

1. Every versioned object with history in SVN can be referenced using PEG-revision for its history state
2. Folder in SVN-repo is object of versioning
3. In order to compare two folders, you have to have folder-diff tool (for your OS) and know (command-line) options for calling it

According to Slant's comparison :

• Meld can be used on Linux for folder-diffing
• Best folder-diff tool is Beyond Compare

From points 1-3 above it follows that Meld can be used for your task in form

meld folder@REV1 folder@REV2

Answer 2

Folder comparision is usually required for code review or branch merging. It seems that the simplest approach is as follows:

1. Find last trunk revision merged to a current brach
2. If the current branch was not merged from trunk, then find the branch creration revision
3. Checkout trunk with a specified revision to some folder
4. Compare the trunk folder and the brach folder

I didn't found any existing tools supporting it. Here is a simple bash script:

TRUNK_FOLDER=~/tmp/trunk-merge
LAST_TRUNK_MERGED_REV=$(svn mergeinfo --show-revs merged -R "^/trunk" | tail -n 1)
if [[ -z "$LAST_TRUNK_MERGED_REV" ]]; then
  LAST_TRUNK_MERGED_REV=$(svn log -r 1:HEAD --limit 1 --stop-on-copy -q | grep -oP "^r\K[0-9]+")
  echo "The branch was copied from trunk@$LAST_TRUNK_MERGED_REV"
else
  echo "The branch was last merged from trunk@$LAST_TRUNK_MERGED_REV"
fi
svn update -r $LAST_TRUNK_MERGED_REV "$TRUNK_FOLDER"
meld "$TRUNK_FOLDER" .