gaqson.blogg.se - Svn client macos diff merge

to coordinate who has got the write token on which parts of the document.

Only after that try to get "svnwdiff foo" working, too.įor merging, I have found out that the best solution is to not need to merge.Then make sure that "mywdiff foo bar" works.First make sure that something like "wdiff foo bar" works.If you are having problems getting all this working, try the following: On Mac OS X, "port install wdiff" should do the trick. If you are using Ubuntu or Debian, just install the "wdiff" package. Wdiff -n -w "$m" | fgrep -C2 "$esc"įinally, you will also need the wdiff tool.

Put the following shell scripts in your $PATH:Įxec svn diff -diff-cmd="mywdiff" #!/bin/sh Write svnwdiff -c6445 foo.tex | less -R if you need a pager.You can use svnwdiff -c6445 foo.tex just like you can use svn diff -c6445 foo.tex.You can simply write svnwdiff and you will see all your local changes.If you need a pager, pipe your output to less -R instead of less. Simply write svnwdiff instead of svn diff. If you have made very extensive changes, occasionally it is better to use the usual diff.

It is designed for black-on-white terminals customise the colour codes if needed.

bold black on yellow background: added.

For example, you can have each paragraph as a very long line in your source code even then, the diff output will be easy to read and concise. It is word-based and hence does not care about line breaks. I have used it both on Linux and Mac OS X. This is not Latex-aware, but it seems to work very well with Latex documents (and Bibtex files, too). Edit: Code available for both Subversion and Git here: įor diffing, I have successfully used the following approach.