[darcs-devel] confusing hunk patch

Tupshin Harper tupshin at tupshin.com
Sun May 8 04:40:28 PDT 2005


David Roundy wrote:

>On Sun, May 08, 2005 at 04:30:16AM -0700, Tupshin Harper wrote:
>  
>
>>One last question for now. Can a merge ever consist of anything other
>>than hunks? I'm guessing yes in theory, but no in current
>>implementation, but I could easily be wrong about either.
>>    
>>
>
>I presume you mean a merger? Yes, it can have pretty much any sorts of
>patches in it--e.g. if one person tries to add a file and another adds a
>directory with the same name.
>  
>
Doh...of course...thanks.

-Tupshin




More information about the darcs-devel mailing list