When using SVN it's sometimes the case that you'll type:
Only to realise that you've just accidentally committed the wrong changes, or even some files you didn't want in the subversion repository.
Obviously the svn revert command won't help as that's for reverting local changes. If you want to undo and roll back your changes from r12345 then the magic SVN runes are:
svn merge -c -12345 .
Then you can review and then commit those changes (with a suitable commit log message about rolling back or undoing the revision).
The option -c -<#> is equivalent to -m <#>:<#-1>. Notice that there is a dash before the number, without it you would get -m <#-1>:<#>. The lone dot just tells SVN to work on the repository in the current directory.
Further details about the merge command options can be found here.
Wednesday, February 01, 2012
When using SVN it's sometimes the case that you'll type:
Tuesday, October 25, 2011
Following on from my previous post I was chatting with a friend and they pointed out that I could also make use of preexec to get my desired behaviour.
So I removed the entries for wide links and unix extensions from my smb.conf, allowing them to go back to being the default. I then changed my mythtv share to contain:
[mythtv] comment = Myth TV Recordings path = /auto/mythtv guest ok = Yes preexec = ls /auto/mythtv
This then solves the issue of Samba not allowing the share to be opened due to the "canonicalize_connect_path failed for service " error.
Tuesday, September 27, 2011
Since upgrading to Samba 2:3.5.11~dfsg-1 (or possibly slightly earlier) on my Debian based home server I found that some of the shares were no longer working. I could see them when browsing the network device, it just wouldn't let me access them.
This seemed to only be happening to my Samba shares which were pointing directly at the root of an autofs mount point, which in my case was a mythtvfs mount at /auto/mythtv.
What made this more puzzling was that if I ssh'ed into the machine then I could happily do
ls /auto/mythtvand see all my files. The final piece of the puzzle fitted into place when I realised that the Samba share would work if the mount was already mounted.
A look at the samba logs indicated the following:
smbd/service.c:988(make_connection_snum) canonicalize_connect_path failed for service mythtv, path /auto/mythtv
On a hunch I tried the wide links option (which requires disabling unix extensions) by adding the following to the global section of my /etc/samba/smb.conf:
[global] # Need to disable unix extensions and allow wide links to allow /auto to be mounted unix extensions = no wide links = yesAnd then restarted samba with "/etc/init.d/samba restart". This then fixed the issue, allowing my autofs mount points to be mounted correctly. The big downside of this is that unix extensions which allow symlinks and hard links over samba are then disabled. If I get the time I might look into seeing if I can patch canonicalize_connect_path to work correctly with autofs mount points without exposing any security flaws.
Possibly the most irritating thing about this issue was that searching for the terms "Samba" and "autofs" gives lots of hits for the other side of the situation; using autofs to mount Samba shares automatically.
Friday, June 17, 2011
I've got a home media machine which I to watch MythTV and various online video streaming services. It's been annoying me for a while (possibly since I updated to Ubuntu 11.04) that there was tearing on the screen. It looked exactly like it wasn't vsyncing correctly, but I had vsyncing enabled in all the players I was trying.
The machine I'm using is an Acer Revo with NVIDIA ION chipset, so it isn't the most powerful system. Searching the internet for 'tearing' turned up results which were mostly about people not being able to play 720p or 1080p videos. However that certainly wasn't my issue as I'd done all of the following:
- Giving the graphics card 512MB of RAM (called UMA in the BIOS setting).
- Enabling VDPAU acceleration.
- Disabling the compiz window manager (selecting "Ubuntu classic (no effects)" as the session).
- Setting export __GL_SYNC_TO_VBLANK=1 and ignoring issues with vsync occurring for the wrong display.
- Checking the refresh rate was correctly setup with nvidia-settings utility.
- Updating to the latest NVIDIA drivers
But none of this helped. I then realised that all rendering to the screen was suffering from this, not just video playback. I wondered if the ION couldn't handle the memory bandwidth, but turning down the resolution didn't help. I then thought that maybe it was my TV being a bit broken with HDMI, but testing that would require finding a VGA cable or moving a monitor downstairs, so I didn't try that.
I even got to the point of thinking about installing Windows XP to see if it had the same issue and, if it didn't, giving up on Ubuntu. However after one last search I discovered a post on the XBMC forum. It contained the wisdom of adding the following to /etc/X11/xorg.conf:
Section "Extensions" Option "Composite" "Disable" EndSection
So I went ahead and did that, restarted X and all tearing was gone. I don't know where the bug is in the system, but I'm just glad of the ability in Linux to control things like this.
Monday, May 16, 2011
Recently I started upgrading my various MythTV front-end machines to Ubuntu 11.04. I was disappointed to discover that the unity bar at the top of the screen is still there.
In previous version of Ubuntu this would happen if you had the Appearance setting on anything other than basic (I forget exactly what it was called, but it was the first option in the last tab in the Appearance settings application).
However in 11.04 the Appearance settings application no longer has this options (this appears to be due to 11.04 using the Compiz window manage if it's available).
This is apparently a well known issue, but luckily the fix is fairly simple. From here I discovered that it's just a case of installing the advanced appearance settings application (called CCSM) and selecting Utility->Workaround->Legacy Fullscreen Support.
Quite what this workaround breaks and therefore why it isn't on by default isn't mentioned anywhere, but I'm happy for now as I can still watch TV.
Saturday, April 23, 2011
I've updated the twitter fixer user script so that now it doesn't cause some twitter information to be impossible to view. Previously if you clicked on a tweet or a twitter user to get further details then the box which contained the further details would be hidden on the right side of the screen.
This new version fixes that issue by presenting it to you in (almost) full screen, in the middle of your display.
If anyone sees any other issues then please let me know via a comment.
Wednesday, March 16, 2011
A friend mentioned to me that they were annoyed with the way the new Twitter layout wasted lots of pixels to the left and the right of the timeline. So I knocked together a quick user script for Google Chrome to do this.
I've had this sitting around for a while, but I've finally got around to setting up somewhere where I can put it.
The words and photos on this webpage which are created by Toby Gray are licensed under a Creative Commons Attribution-NonCommercial-ShareAlike 2.0 England & Wales License.