Artifact
054b5a1970b39eb8fa34f982da615a4bb9684585:
Ticket change
[054b5a1970]
- New ticket [5664fcba51]
merge disjunct trees.
by
anonymous
2010-10-06 10:54:10.
0000: 44 20 32 30 31 30 2d 31 30 2d 30 36 54 31 30 3a D 2010-10-06T10:
0010: 35 34 3a 31 30 0a 4a 20 63 6f 6d 6d 65 6e 74 20 54:10.J comment
0020: 49 66 5c 73 6f 6e 65 5c 73 77 61 6e 74 73 5c 73 If\sone\swants\s
0030: 74 6f 5c 73 75 6e 69 66 69 79 5c 73 74 77 6f 5c to\sunifiy\stwo\
0040: 73 72 65 70 6f 73 69 74 6f 72 69 65 73 2c 5c 73 srepositories,\s
0050: 74 68 65 72 65 5c 73 61 72 65 5c 73 61 5c 73 73 there\sare\sa\ss
0060: 74 61 72 74 65 72 5c 73 64 6f 63 73 5c 73 68 65 tarter\sdocs\she
0070: 72 65 3a 5c 72 5c 6e 5c 72 5c 6e 68 74 74 70 3a re:\r\n\r\nhttp:
0080: 2f 2f 77 77 77 2e 6d 61 69 6c 2d 61 72 63 68 69 //www.mail-archi
0090: 76 65 2e 63 6f 6d 2f 66 6f 73 73 69 6c 2d 75 73 ve.com/fossil-us
00a0: 65 72 73 40 6c 69 73 74 73 2e 66 6f 73 73 69 6c ers@lists.fossil
00b0: 2d 73 63 6d 2e 6f 72 67 2f 6d 73 67 30 31 36 34 -scm.org/msg0164
00c0: 31 2e 68 74 6d 6c 5c 72 5c 6e 5c 72 5c 6e 42 75 1.html\r\n\r\nBu
00d0: 74 5c 73 61 66 74 65 72 5c 73 74 68 61 74 5c 73 t\safter\sthat\s
00e0: 79 6f 75 5c 73 75 73 75 61 6c 6c 79 5c 73 68 61 you\susually\sha
00f0: 76 65 5c 73 74 77 6f 5c 73 63 6f 6d 70 6c 65 74 ve\stwo\scomplet
0100: 65 6c 79 5c 73 64 69 73 6a 75 6e 63 74 5c 73 74 ely\sdisjunct\st
0110: 72 65 65 73 5c 73 28 62 65 63 61 75 73 65 5c 73 rees\s(because\s
0120: 74 68 65 79 5c 73 62 6f 74 68 5c 73 73 74 61 72 they\sboth\sstar
0130: 74 5c 73 66 72 6f 6d 5c 73 64 69 66 66 65 72 65 t\sfrom\sdiffere
0140: 6e 74 5c 73 22 65 6d 70 74 79 5c 73 63 6f 6d 6d nt\s"empty\scomm
0150: 69 74 73 22 2e 5c 73 53 6f 5c 73 61 5c 73 73 69 its".\sSo\sa\ssi
0160: 6d 70 6c 65 5c 73 22 66 6f 73 73 69 6c 5c 73 6d mple\s"fossil\sm
0170: 65 72 67 65 22 5c 73 66 61 69 6c 73 5c 73 64 75 erge"\sfails\sdu
0180: 65 5c 73 74 6f 5c 73 6e 6f 5c 73 63 6f 6d 6d 6f e\sto\sno\scommo
0190: 6e 5c 73 61 6e 63 65 73 74 6f 72 2e 5c 72 5c 6e n\sancestor.\r\n
01a0: 5c 72 5c 6e 41 73 73 75 6d 69 6e 67 5c 73 62 6f \r\nAssuming\sbo
01b0: 74 68 5c 73 70 72 6f 6a 65 63 74 73 5c 73 68 61 th\sprojects\sha
01c0: 76 65 5c 73 61 5c 73 63 6c 65 61 6e 5c 73 22 6e ve\sa\sclean\s"n
01d0: 61 6d 65 73 70 61 63 65 22 2c 5c 73 73 6f 5c 73 amespace",\sso\s
01e0: 74 68 61 74 5c 73 61 5c 73 73 69 6d 70 6c 65 5c that\sa\ssimple\
01f0: 73 22 75 6e 69 66 79 5c 73 61 6c 6c 5c 73 66 69 s"unify\sall\sfi
0200: 6c 65 73 22 5c 73 77 6f 75 6c 64 5c 73 77 6f 72 les"\swould\swor
0210: 6b 2c 5c 73 61 5c 73 77 61 79 5c 73 74 6f 5c 73 k,\sa\sway\sto\s
0220: 64 6f 5c 73 65 78 61 63 74 6c 79 5c 73 74 68 61 do\sexactly\stha
0230: 74 5c 73 77 6f 75 6c 64 5c 73 72 65 61 6c 6c 79 t\swould\sreally
0240: 5c 73 62 65 5c 73 6e 69 63 65 2e 5c 72 5c 6e 5c \sbe\snice.\r\n\
0250: 72 5c 6e 49 5c 73 61 6d 5c 73 63 75 72 72 65 6e r\nI\sam\scurren
0260: 74 6c 79 5c 73 74 72 79 69 6e 67 5c 73 74 6f 5c tly\strying\sto\
0270: 73 77 72 69 74 65 5c 73 63 6f 64 65 5c 73 74 6f swrite\scode\sto
0280: 5c 73 63 72 65 61 74 65 5c 73 6d 79 5c 73 6f 77 \screate\smy\sow
0290: 6e 5c 73 6d 61 6e 69 66 65 73 74 5c 73 74 6f 5c n\smanifest\sto\
02a0: 73 69 6e 73 65 72 74 5c 73 69 74 5c 73 62 79 5c sinsert\sit\sby\
02b0: 73 68 61 6e 64 5c 73 75 73 69 6e 67 5c 73 74 65 shand\susing\ste
02c0: 73 74 2d 63 6f 6e 74 65 6e 74 2d 70 75 74 2c 5c st-content-put,\
02d0: 73 66 6f 6c 6c 6f 77 65 64 5c 73 62 79 5c 73 61 sfollowed\sby\sa
02e0: 5c 73 72 65 62 75 69 6c 64 2e 5c 73 49 5c 73 68 \srebuild.\sI\sh
02f0: 61 76 65 5c 73 6e 6f 5c 73 69 64 65 61 2c 5c 73 ave\sno\sidea,\s
0300: 69 66 5c 73 74 68 69 73 5c 73 77 69 6c 6c 5c 73 if\sthis\swill\s
0310: 65 76 65 6e 5c 73 77 6f 72 6b 5c 73 6f 75 74 2e even\swork\sout.
0320: 5c 73 53 6f 6d 65 5c 73 6d 6f 72 65 5c 73 22 6c \sSome\smore\s"l
0330: 6f 77 5c 73 6c 65 76 65 6c 5c 73 74 6f 6f 6c 73 ow\slevel\stools
0340: 22 5c 73 74 6f 5c 73 61 73 73 69 73 74 5c 73 70 "\sto\sassist\sp
0350: 65 6f 70 6c 65 5c 73 64 6f 69 6e 67 5c 73 73 6f eople\sdoing\sso
0360: 6d 65 5c 73 22 6e 6f 6e 5c 73 73 74 61 6e 64 61 me\s"non\sstanda
0370: 72 64 5c 73 73 74 75 66 66 22 5c 73 77 6f 75 6c rd\sstuff"\swoul
0380: 64 5c 73 72 65 61 6c 6c 79 5c 73 62 65 5c 73 6e d\sreally\sbe\sn
0390: 69 63 65 2e 5c 73 46 6f 72 5c 73 65 78 61 6d 70 ice.\sFor\sexamp
03a0: 6c 65 5c 73 74 6f 6f 6c 73 5c 73 74 6f 5c 73 73 le\stools\sto\ss
03b0: 65 74 75 70 5c 73 61 5c 73 6d 61 6e 69 66 65 73 etup\sa\smanifes
03c0: 74 2c 5c 73 63 68 65 63 6b 5c 73 69 74 2c 5c 73 t,\scheck\sit,\s
03d0: 61 6e 64 5c 73 69 6d 70 6f 72 74 5c 73 69 74 2e and\simport\sit.
03e0: 0a 4a 20 66 6f 75 6e 64 69 6e 20 5b 66 38 32 37 .J foundin [f827
03f0: 33 31 39 62 64 34 5d 5c 73 32 30 31 30 2d 30 39 319bd4]\s2010-09
0400: 2d 32 31 5c 73 31 33 3a 35 34 3a 31 30 5c 73 55 -21\s13:54:10\sU
0410: 54 43 2c 5c 73 66 72 6f 6d 5c 73 64 65 62 69 61 TC,\sfrom\sdebia
0420: 6e 5c 73 75 6e 73 74 61 62 6c 65 0a 4a 20 70 72 n\sunstable.J pr
0430: 69 76 61 74 65 5f 63 6f 6e 74 61 63 74 20 65 37 ivate_contact e7
0440: 30 30 39 62 31 31 34 39 65 32 33 36 63 66 36 31 009b1149e236cf61
0450: 36 63 62 63 65 37 38 30 34 35 33 35 62 31 31 32 6cbce7804535b112
0460: 37 61 66 38 64 30 0a 4a 20 73 65 76 65 72 69 74 7af8d0.J severit
0470: 79 20 49 6d 70 6f 72 74 61 6e 74 0a 4a 20 73 74 y Important.J st
0480: 61 74 75 73 20 4f 70 65 6e 0a 4a 20 74 69 74 6c atus Open.J titl
0490: 65 20 6d 65 72 67 65 5c 73 64 69 73 6a 75 6e 63 e merge\sdisjunc
04a0: 74 5c 73 74 72 65 65 73 0a 4a 20 74 79 70 65 20 t\strees.J type
04b0: 46 65 61 74 75 72 65 5f 52 65 71 75 65 73 74 0a Feature_Request.
04c0: 4b 20 35 36 36 34 66 63 62 61 35 31 66 32 66 32 K 5664fcba51f2f2
04d0: 63 65 65 64 66 64 62 62 35 34 30 61 36 37 38 66 ceedfdbb540a678f
04e0: 65 61 37 39 30 32 66 36 36 32 0a 55 20 61 6e 6f ea7902f662.U ano
04f0: 6e 79 6d 6f 75 73 0a 5a 20 35 31 61 65 36 38 30 nymous.Z 51ae680
0500: 36 34 32 39 64 66 39 34 61 30 33 39 66 31 38 31 6429df94a039f181
0510: 32 31 31 30 37 39 34 33 64 0a 21107943d.