somewhat OT: maybe useful git script git-test-merge

2008-08-07 Thread Marc Weber
Hi @ll, I'd like to tell you about a small script I've written to make life easier with git: git clone git://mawercer.de/git-test-merge It remembers test merge setups so that you can merge different feature branches by typing: $ gtm set setup1 branch1 remotes/branch2 branch3 $

git and sync-all: Why not merge in libraries?

2008-08-07 Thread Bryan Donlan
Hi all, With the upcoming switchover to git, has any thought gone into merging in the libraries into the main ghc tree (eliminating the need for a 'git-all')? git can merge two histories with no common ancestor, so no history would be lost - though you'd have to ask greater gurus than I the

Re: git and sync-all: Why not merge in libraries?

2008-08-07 Thread Malcolm Wallace
With the upcoming switchover to git, has any thought gone into merging in the libraries into the main ghc tree The libraries are going to remain under darcs, because they are shared with other haskell compilers. Regards, Malcolm ___

Re: Version control systems

2008-08-07 Thread Manuel M T Chakravarty
Max Bolingbroke: 2008/8/6 Duncan Coutts [EMAIL PROTECTED]: On Tue, 2008-08-05 at 22:12 -0700, Don Stewart wrote: marlowsd: Following lots of useful discussion and evaluation of the available DVCSs out there, the GHC team have made a decision: we're going to switch to git. Hooray, this