Dreams of Thought

Are dreams thoughts… or are thoughts dreams..

RSS Feed

Monthly Archives: August 2011

How to solve the “local edit, incoming delete upon update” issue in SVN

0 Comments

When I removed a file from svn it caused me lot of problems. This particular file was in CamelCase and I needed to replace it with a file in lower case. I svn deleted the CamelCase file and committed a copy of the lower case file. All this happened in a windows system. When I updated the checked out branch I got the error :

At revision 17582.
!  +  C FooBar.php
>   local edit, incoming delete upon update

Multiple attempts at svn cleanup, svn update etc. failed. I came across this stack overflow thread which recommended svn resolve. This did not work for me. Further down the thread I came across another solution which worked.

  1. create FooBar.php ( $touch FooBar.php )
  2. svn revert it ( $svn revert FooBar.php )
  3. Check status ( $svn status ) . It should say ?FooBar.php
  4. Now remove FooBar.php ( $rm FooBar.php )

That’s it, you’re done :)

Filed under code
Aug 11, 2011

apt-get with proxy

0 Comments

You will notice that the proxy settings you provide in the network settings may not be picked up by apt-get while installing a package. So if you want to run apt-get via a proxy then you need to use a tool like proxychains. Proxychains is a tool that allow you to run a command via a proxy even if the command itself does not support proxies. You can install proxychains by running apt-get install proxychains. In case this is not possible for you, then get the proxychains tarball from the proxychains site.Compile and install – it’s very simple to do. Just run ./configure and then make and make install. Run make install as root.

Once this is done you have proxychains installed in your system. Proxychains takes its settings from one of 3 files :

1)    ./proxychains.conf
2)    $(HOME)/.proxychains/proxychains.conf
3)    /etc/proxychains.conf

I edited the /etc/proxychains.conf file directly. I have a SOCKS5 proxy running on localhost over port 8080. So I add an entry towards the end like this -

socks5  127.0.0.1 8080

Once you have this and have your socks proxy running, you’re ready to start running your commands. Imagine you want to run apt-get update. This is how it would be done -

$ sudo proxychains apt-get upgrade

That’s it :)

Filed under Linux
Aug 1, 2011

Illegible captcha

0 Comments

How in heaven’s name am I supposed to fill this one! :)

 

( click on image to see a bigger one )

illegible captcha

Filed under technology
Aug 1, 2011