[darcs-devel] complicated merger example...more confusion

[Tupshin Harper]

Sorry to bother again, but this really has me stumped. Any insights into
how this is handled would be greatly appreciated.

Thanks

-Tupshin

Tupshin Harper wrote:

>This patch in the darcs source:
>20041001004444-75d02-27a88610389c8cdc546922ed00e37f1aed398745.gz
>"Consolidate make_email and make MIME compliant"
>
>has one of the more complicated set of merger patches I've seen in a
>repository, and the existence and nature of the rmfiles in it are quite
>confusing. This patch consists of  9 top-level subpatches, of which 3
>affect the file ReportBug.lhs. These subpatches (4, 5, and 6) are
>represented with their contents hierarchically below. The letters in
>parentheses are merely for identification.
>
>The patches labeled as b, k, and ab are all "rmfile ./ReportBug.lhs".
>
>If somebody could walk me through how this set of patches is actually
>applied and why 3 rmfiles of the same file are not a problem, it would
>greatly help me bridge the gap between theory and practice.
>
>Thanks
>
>-Tupshin
>
>
>subpatch 4
>merger (a)
>    rmfile (b)
>    merger (c)
>       hunk (d)
>       hunk (e)
>      
>
>subpatch 5
>merger (f)
>    merger (g)
>       merger (h)
>          hunk (i)
>          hunk (j)  
>       rmfile (k)
>    merger (l)
>       merger (m)
>          hunk (n)
>          hunk (o)
>       hunk (p)
>
>subpatch 6
>merger (q)
>    merger (r)
>       merger (s)
>          merger (t)
>             hunk (u)
>             hunk (v)
>          hunk (w)
>       merger (x)
>          merger (y)
>             hunk (z)
>             hunk (aa)
>          rmfile (ab)
>    merger (ac)
>       merger (ad)
>          hunk (ae)
>          merger (af)
>             hunk (ag)
>             hunk (ah)
>       hunk (ai)
>
>_______________________________________________
>darcs-devel mailing list
>darcs-devel at darcs.net
>http://www.abridgegame.org/cgi-bin/mailman/listinfo/darcs-devel
>  
>