[SciPy-Dev] git on windows (was: scipy.stats)

[Fernando Perez]

Hi Josef,

On Tue, Jun 1, 2010 at 1:31 PM,  <josef.pktd at gmail.com> wrote:
> My main problem with git was the treatment of the file system, and I
> find it much easier to work with separate branches as in bzr or
> mercurial.

One thing I've found very useful after transitioning to git for
IPython is the git new-workdir command:

http://kerneltrap.org/mailarchive/git/2008/5/21/1900044
http://nuclearsquid.com/writings/git-new-workdir.html

It lets me keep a few branches around that I want 'permanent' on my
filesystem, in a bzr shared-repo style, while using git for the
lightweight feature-only branches.  This is how it looks like right
now on my system:

- Main ipython git repo:
uqbar[ipython]> cd ipython/
(Master)uqbar[ipython]> git branch -a
  0.10
  0.10.1
  0.8
  0.9
* Master
  master
  remotes/mainline/0.10
  remotes/mainline/0.10.1
  remotes/mainline/0.8
  remotes/mainline/0.9
  remotes/mainline/master
  remotes/min/0.10
  remotes/min/0.10.1
  remotes/min/0.8
  remotes/min/0.9
  remotes/min/master
  remotes/origin/master


And a separate 'branches' repo, populated with new-workdir:

(Master)uqbar[ipython]> cd ../branches
uqbar[branches]> d
/home/fperez/ipython/branches
total 16
drwxr-xr-x 10 fperez 4096 2010-05-13 01:35 0.10/
drwxr-xr-x 10 fperez 4096 2010-05-13 15:48 0.10.1/


where I keep branches I may need to see persistently on disk.

HTH.

Cheers,

f