[darcs-users] Re: Hang on pull

Tommy Pettersson ptp at lysator.liu.se
Fri Sep 24 11:13:25 UTC 2004


On Thu, Sep 23, 2004 at 03:09:23PM -0700, Lee Cantey wrote:
> Unfortunately it still hangs at this step.  At this point I have in the VOB:
[...description of branch contents...}

It looks just like it should, PROJECT 6.5 is to be pulled,
and would probably conflict a bit with Local Changes.

I'm sorry this didn't work.  It has always succeeded for me,
even when upstream reindented the whole code so that every
local change I had made conflicted.  Well, that won't help
you a bit, of course.  :-(

It is somewhat disturbing that just two patches won't
merge easily.  Although they are really named sets of many
(probably very many) patches.  But those many patches should,
to the best of my understanding (which may be not so much in
this case), be mostly independent.


-- 
Tommy Pettersson <ptp at lysator.liu.se>




More information about the darcs-users mailing list