[Mediawiki-l] Question about SVN
Ross McKay
rosko at zeta.org.au
Tue Aug 12 23:30:59 UTC 2008
The Gadget Doctor wrote:
>[...]
>I know that I can update to the latest version with the (scarily brief and
>powerful "svn up") but I'm looking for something that will tell me exactly
>what files will change before I issue that command.
To see which files have been updated in the repository and will be
pulled by next update:
svn stat -u
To see what has changed in each file:
svn diff -r head filename
To get a nice graphical diff (on Linux with Meld installed), so that you
can easily see the difference or even pull in some changes selectively:
svn diff --diff-cmd meld -r head filename
>I would also like to be
>able to see what would happen if I gave the command "svn sw" and switched to
>another branch.
Run a merge but specify a dry-run so that nothing is actually pulled
down:
svn merge --dry-run /path/to/branch1 /path/to/branch2
--
Ross McKay, Toronto, NSW Australia
"Let the laddie play wi the knife - he'll learn"
- The Wee Book of Calvin
More information about the MediaWiki-l
mailing list