I know that this list is Mediawiki but I feel at home here and I'm sure someone knows the answer to this.
I'm using SVN now to manage Mediawiki and, once one gets over the learning curve, its tremendous.
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. I would also like to be able to see what would happen if I gave the command "svn sw" and switched to another branch.
I've looked at "svn st" and "svn info" but can't seem to find something that basically runs "svn up" without actually updating anything!
Anyone or should I go and get friendly on the SVN boards?
The update command does not offer a dry run flag as such, but the merge command can be used as a substitute. This article talks about how to do it, though I have not tried it personally.
http://translocator.ws/2005/10/12/svn-update-dry-run
Good luck!
-- Jim R. Wilson (jimbojw)
On Tue, Aug 12, 2008 at 12:44 PM, The Gadget Doctor mediawiki@thegadgetdoctor.com wrote:
I know that this list is Mediawiki but I feel at home here and I'm sure someone knows the answer to this.
I'm using SVN now to manage Mediawiki and, once one gets over the learning curve, its tremendous.
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. I would also like to be able to see what would happen if I gave the command "svn sw" and switched to another branch.
I've looked at "svn st" and "svn info" but can't seem to find something that basically runs "svn up" without actually updating anything!
Anyone or should I go and get friendly on the SVN boards? _______________________________________________ MediaWiki-l mailing list MediaWiki-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-l
svn diff -r HEAD
That'll give you the diff between your copy and head. Which svn up will update to.
Though, do note that the output will be rather large, and hard to read on prompt. With all the -'s and +'s I doubt it'll be to useful for doing updates.
~Daniel Friesen(Dantman, Nadir-Seen-Fire) of: -The Nadir-Point Group (http://nadir-point.com) --It's Wiki-Tools subgroup (http://wiki-tools.com) --The ElectronicMe project (http://electronic-me.org) --Games-G.P.S. (http://ggps.org) -And Wikia ACG on Wikia.com (http://wikia.com/wiki/Wikia_ACG) --Animepedia (http://anime.wikia.com) --Narutopedia (http://naruto.wikia.com)
The Gadget Doctor wrote:
I know that this list is Mediawiki but I feel at home here and I'm sure someone knows the answer to this.
I'm using SVN now to manage Mediawiki and, once one gets over the learning curve, its tremendous.
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. I would also like to be able to see what would happen if I gave the command "svn sw" and switched to another branch.
I've looked at "svn st" and "svn info" but can't seem to find something that basically runs "svn up" without actually updating anything!
Anyone or should I go and get friendly on the SVN boards?
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
Thank you! just what I wanted... and I see that there is a RC3 there now?
I also just installed Meld but perhaps I shouldn't have... I only have SSH access to my remote server. That Yum install command is a bit too powerful. Meld doesn't run, I guess it's looking for graphics.
On Tue, Aug 12, 2008 at 7:30 PM, Ross McKay rosko@zeta.org.au wrote:
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
MediaWiki-l mailing list MediaWiki-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-l
The Gadget Doctor wrote:
I also just installed Meld but perhaps I shouldn't have... I only have SSH access to my remote server. That Yum install command is a bit too powerful. Meld doesn't run, I guess it's looking for graphics.
Yup, that's part and parcel of the "graphical diff" bit.
However, if you ssh into your server from a *nix box running X, you may be able to run Meld if you tell ssh to support X:
ssh -X user@server
mediawiki-l@lists.wikimedia.org