Posts Tagged ‘git

27
Nov
13

Using ediff with Version Control

This is just a quick note about a nice emacs feature.

If you develop with emacs, you may have heard of/used ediff. This is a very handy diff program which runs inside emacs. We use this with a custom hook at work to work with our version control system. I found out that it works nicely with more standard version control systems as well.

The main way to use ediff is the command

  ediff-buffers

This lets you choose two buffers to diff. To do this for different revisions of a file you can use the command

  ediff-revision

This will ask for which file you want to view revisions of (default, the current buffer), and the two revisions to compare (default latest revision and the current state). The you will have the file you asked for loaded in the two revisions you asked for.

Using mercurial personally I find this more informative than the output from hg diff in complicated cases. I believe this works for any version control system recognised by emacs, e.g. mercurial git and subversion.

Advertisements
17
Sep
12

I’m Back, and This Time There’s Versioning!

It has been a while! Sorry about that but I’ve been on holiday and moving etc, but now I’m back and a lot has changed since I last posted. I have started using distributed version control with git and mercurial via GitHub and BitBucket. This means that you don’t have to just look at my code on Box with it’s limited syntax editing and no versioning. Now you can see exactly what I’ve been up to! Continue reading ‘I’m Back, and This Time There’s Versioning!’

16
Jul
12

Finding Primes: Part I

Over the last week or so I’ve been working on some old code of mine. As the title of this post suggests it is to do with that odd pastime of mathematicians: finding prime numbers. I have made a few attempts to make lists of prime numbers over the years in numerous different ways. This is a small introduction to what will no doubt be a small series of many posts. This is an on going work in C++ although I’ll also be writing about an implementation I wrote in Python and a discussion of why I no longer use it for large calculations. During this process I have also taught myself to use git and in particular GitHub. So if you are interested in being ahead of my posts here is my GitHub and in particular this project.