[darcs-users] Re: Hang on pull

[Andrew Pimlott]

On Thu, Sep 23, 2004 at 03:09:23PM -0700, Lee Cantey wrote:
> Tommy Pettersson wrote:
> 
> >  3)  Merge those two patches (by pulling the upgrade patch from vendor to
> >  VOB)
> >      (This will only cause simple conflicts, so it won't take forever)
> 
> Unfortunately it still hangs at this step.

This should be easy to reproduce now....

> At this point I have in the VOB:
> 
> Thu Sep 23 13:38:30 PDT 2004  
>   * Local Changes
> 
> Sat Sep  4 11:05:32 PDT 2004  
>   tagged PROJECT-6-4-4
> 
> Sat Sep  4 09:20:49 PDT 2004  
>   * PROJECT 6.4.4
> 
> And the following in the real vendor branch:
> 
> Wed Sep 22 08:18:34 PDT 2004
>   * PROJECT 6.5
> 
> Sat Sep  4 11:05:32 PDT 2004
>   tagged PROJECT-6-4-4
> 
> Sat Sep  4 09:20:49 PDT 2004
>   * PROJECT 6.4.4

Dumb question: are the two "PROJECT 6.4.4"s actually the same patch, ie
from a single record operation?  If you recorded the old vendor tree
twice, even if they have the same contents, darcs will treat them as
independent and try to merge them.

Andrew