Re: [darcs-users] How to develop on a (GHC) branch with darcs

2010-12-22 Thread Brian Bloniarz
Hi Simon, On 12/08/2010 12:45 AM, Simon Peyton-Jones wrote: I have personal experience of git, because I co-author papers with git users. I am not very technologically savvy, but my failure rate with git is close to 100%. Ie I can do the equivalent of 'pull' or 'push' but I fail at

RE: [darcs-users] How to develop on a (GHC) branch with darcs

2010-12-09 Thread Simon Peyton-Jones
| thoroughly exhausted. Even when Darcs was in a far | less advanced state than it is in now, the conclusion seemed | to be that the best interests of the Haskell community at | large are served by remaining with Darcs. So it would be a bit | strange if this branching issue, which is a serious

Re: [darcs-users] How to develop on a (GHC) branch with darcs

2010-12-09 Thread Simon Marlow
On 08/12/2010 17:39, Yitzchak Gale wrote: Some of those are already in the works, and all except possibly (5) are known to be within reach. So the answer is yes, this problem is now on the verge of being solved in Darcs. I think that might be a little overoptimistic. The fundamental problem

Re: [darcs-users] How to develop on a (GHC) branch with darcs

2010-12-09 Thread Jean-Marie Gaillourdet
Hi Simon, Simon Peyton-Jones simo...@microsoft.com writes: | known problem with darcs with no obvious solution. For me, switching | GHC to git would certainly be a win. I have personal experience of git, because I co-author papers with git users. I am not very technologically savvy, but

Re: [darcs-users] How to develop on a (GHC) branch with darcs

2010-12-09 Thread Ganesh Sittampalam
On Thu, 9 Dec 2010, Simon Marlow wrote: On 08/12/2010 17:39, Yitzchak Gale wrote: Some of those are already in the works, and all except possibly (5) are known to be within reach. So the answer is yes, this problem is now on the verge of being solved in Darcs. I think that might be a little

Re: [darcs-users] How to develop on a (GHC) branch with darcs

2010-12-09 Thread Ganesh Sittampalam
On Wed, 8 Dec 2010, Stephen J. Turnbull wrote: Ganesh Sittampalam writes: I think there are three things that can help with this problem: 1) a darcs rebase command. This will give you a nice way to manage the workflow already discussed, and you won't have to squish everything through into

RE: [darcs-users] How to develop on a (GHC) branch with darcs

2010-12-08 Thread Simon Peyton-Jones
| known problem with darcs with no obvious solution. For me, switching | GHC to git would certainly be a win. I have personal experience of git, because I co-author papers with git users. I am not very technologically savvy, but my failure rate with git is close to 100%. Ie I can do the

RE: [darcs-users] How to develop on a (GHC) branch with darcs

2010-12-08 Thread Edward Z. Yang
I like Git for Computer Scientists [1] and Git in pictures [2]. It also sounds like a Git for Darcs users might be in order. Edward [1] http://eagain.net/articles/git-for-computer-scientists/ [2] http://blog.nelhage.com/2010/01/git-in-pictures/ ___

Re: [darcs-users] How to develop on a (GHC) branch with darcs

2010-12-08 Thread Johan Tibell
On Wed, Dec 8, 2010 at 12:31 PM, Edward Z. Yang ezy...@mit.edu wrote: I like Git for Computer Scientists [1] and Git in pictures [2].  It also sounds like a Git for Darcs users might be in order. Once you got the general ideas down I'd recommend

Re: [darcs-users] How to develop on a (GHC) branch with darcs

2010-12-08 Thread Brandon S Allbery KF8NH
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 12/8/10 03:45 , Simon Peyton-Jones wrote: | known problem with darcs with no obvious solution. For me, switching | GHC to git would certainly be a win. I have personal experience of git, because I co-author papers with git users. I am not

Re: [darcs-users] How to develop on a (GHC) branch with darcs

2010-12-08 Thread David Peixotto
On Dec 8, 2010, at 2:45 AM, Simon Peyton-Jones wrote: If anyone has a favourite how to understand git doc, do point me at it. You may have already tried these, but I've found the [official git tutorial][1] to be pretty decent. The [second part][2] contains some details on how git sees the

Re: [darcs-users] How to develop on a (GHC) branch with darcs

2010-12-08 Thread Yitzchak Gale
Iavor Diatchki wrote: I use git for a lot of my development... Given the responses though, it sounds like this is a well known problem with darcs with no obvious solution. Why do you say there is no obvious solution? In fact, Ganesh, representing the Darcs team, responded: 1) a darcs rebase

Re: [darcs-users] How to develop on a (GHC) branch with darcs

2010-12-07 Thread Iavor Diatchki
Hello, Thanks for all your responses (and the --skip-conflicts tip)! I use git for a lot of my development, so I was hoping that I was just experiencing culture shock and simply doing things with the wrong mind-set. Given the responses though, it sounds like this is a well known problem with

Re: [darcs-users] How to develop on a (GHC) branch with darcs

2010-12-06 Thread Ganesh Sittampalam
On Mon, 6 Dec 2010, Simon Peyton-Jones wrote: I too wish there was a good solution here. I've taken to making dated repos, thus http://darcs.haskell.org/ghc-new-co-17Nov10 When it becomes unusable, I make a brand new repo, with a new date starting from HEAD, pull all the old