Merging: Difference between revisions
initial draft, needs expansion |
m Text replacement - "<(\/?)source" to "<$1syntaxhighlight" |
||
| Line 13: | Line 13: | ||
Websvn is a repository browser for Subversion that can be used to visualize differences. The command-line tool '''svnlook''' can also be used on Subversion repositories (remember this tool operates on the local repository path and not a URL so you need to have file system access to the repository). | Websvn is a repository browser for Subversion that can be used to visualize differences. The command-line tool '''svnlook''' can also be used on Subversion repositories (remember this tool operates on the local repository path and not a URL so you need to have file system access to the repository). | ||
< | <syntaxhighlight lang="bash"> | ||
svnlook history /var/repos/svn/myrepo some/path/in/the/repo/ | svnlook history /var/repos/svn/myrepo some/path/in/the/repo/ | ||
</ | </syntaxhighlight> | ||
For each of these relevant revisions, we can show what has changed: | For each of these relevant revisions, we can show what has changed: | ||
< | <syntaxhighlight lang="bash"> | ||
svnlook changed -r7560 /var/repos/svn/myrepo | svnlook changed -r7560 /var/repos/svn/myrepo | ||
</ | </syntaxhighlight> | ||
We can also look closely at the changes using svnlook diff. Adding the optional --no-diff-deleted and --no-diff-added will supress showing differences for those types of events. | We can also look closely at the changes using svnlook diff. Adding the optional --no-diff-deleted and --no-diff-added will supress showing differences for those types of events. | ||
< | <syntaxhighlight lang="bash"> | ||
svnlook diff -r7560 --no-diff-deleted --no-diff-added /var/repos/svn/myrepo | svnlook diff -r7560 --no-diff-deleted --no-diff-added /var/repos/svn/myrepo | ||
</ | </syntaxhighlight> | ||
We can look at just what happened using 'diff' to show the file differences. In this example, we'll use the external visual diff tool 'kdiff3' which is a lot easier to see compared with command-line diff output. | We can look at just what happened using 'diff' to show the file differences. In this example, we'll use the external visual diff tool 'kdiff3' which is a lot easier to see compared with command-line diff output. | ||
< | <syntaxhighlight lang="bash"> | ||
svn diff --diff-cmd kdiff3 \ | svn diff --diff-cmd kdiff3 \ | ||
http://svn.example.com/svn/path/to/file.txt@7560 \ | http://svn.example.com/svn/path/to/file.txt@7560 \ | ||
http://svn.example.com/svn/path/to/file.txt@HEAD | http://svn.example.com/svn/path/to/file.txt@HEAD | ||
</ | </syntaxhighlight> | ||
== Merging == | == Merging == | ||