Artifact
34748258303944b2c9924de2d07a1a96d62b7f7a:
Ticket change
[3474825830]
- Ticket [24e1e78fa3]
Files in conflict are not marked as so status still Open with 2 other changes
by
anonymous
2010-10-15 14:03:15.
0000: 44 20 32 30 31 30 2d 31 30 2d 31 35 54 31 34 3a D 2010-10-15T14:
0010: 30 33 3a 31 35 0a 4a 20 2b 63 6f 6d 6d 65 6e 74 03:15.J +comment
0020: 20 5c 6e 5c 6e 3c 68 72 5c 73 2f 3e 3c 69 3e 61 \n\n<hr\s/><i>a
0030: 6e 6f 6e 79 6d 6f 75 73 5c 73 63 6c 61 69 6d 69 nonymous\sclaimi
0040: 6e 67 5c 73 74 6f 5c 73 62 65 5c 73 4a 6f 65 72 ng\sto\sbe\sJoer
0050: 67 5c 73 53 6f 6e 6e 65 6e 62 65 72 67 65 72 5c g\sSonnenberger\
0060: 73 61 64 64 65 64 5c 73 6f 6e 5c 73 32 30 31 30 sadded\son\s2010
0070: 2d 31 30 2d 31 35 5c 73 31 34 3a 30 33 3a 31 35 -10-15\s14:03:15
0080: 3a 3c 2f 69 3e 3c 62 72 5c 73 2f 3e 5c 6e 54 68 :</i><br\s/>\nTh
0090: 65 72 65 5c 73 61 72 65 5c 73 74 77 6f 5c 73 70 ere\sare\stwo\sp
00a0: 6f 74 65 6e 74 69 61 6c 5c 73 71 75 65 73 74 69 otential\squesti
00b0: 6f 6e 73 5c 73 72 65 6c 61 74 65 64 5c 73 74 6f ons\srelated\sto
00c0: 5c 73 74 68 69 73 3a 5c 72 5c 6e 5c 72 5c 6e 28 \sthis:\r\n\r\n(
00d0: 31 29 5c 73 53 68 6f 75 6c 64 5c 73 66 6f 73 73 1)\sShould\sfoss
00e0: 69 6c 5c 73 61 6c 77 61 79 73 5c 73 73 63 61 6e il\salways\sscan
00f0: 5c 73 66 6f 72 5c 73 74 68 65 5c 73 6d 61 72 6b \sfor\sthe\smark
0100: 65 72 73 5c 73 6f 6e 5c 73 66 69 6c 65 73 5c 73 ers\son\sfiles\s
0110: 77 69 74 68 5c 73 6d 6f 64 69 66 69 65 64 5c 73 with\smodified\s
0120: 6d 74 69 6d 65 2e 5c 73 54 68 69 73 5c 73 77 6f mtime.\sThis\swo
0130: 72 6b 73 5c 73 66 6f 72 5c 73 63 6f 6e 66 6c 69 rks\sfor\sconfli
0140: 63 74 73 5c 73 66 72 6f 6d 5c 73 6d 61 6e 75 61 cts\sfrom\smanua
0150: 6c 5c 73 70 61 74 63 68 65 73 5c 73 74 6f 6f 2e l\spatches\stoo.
0160: 5c 73 49 74 5c 73 68 61 73 5c 73 74 68 65 5c 73 \sIt\shas\sthe\s
0170: 73 74 72 6f 6e 67 5c 73 64 69 73 61 64 76 61 6e strong\sdisadvan
0180: 74 61 67 65 5c 73 6f 66 5c 73 72 65 71 75 69 72 tage\sof\srequir
0190: 69 6e 67 5c 73 72 65 61 64 69 6e 67 5c 73 70 6f ing\sreading\spo
01a0: 74 65 6e 74 69 61 6c 6c 79 5c 73 6c 61 72 67 65 tentially\slarge
01b0: 5c 73 66 69 6c 65 73 5c 73 74 6f 5c 73 64 65 74 \sfiles\sto\sdet
01c0: 65 72 6d 69 6e 65 5c 73 74 68 65 5c 73 63 6f 6e ermine\sthe\scon
01d0: 66 6c 69 63 74 2e 5c 73 53 75 63 68 5c 73 61 5c flict.\sSuch\sa\
01e0: 73 63 68 65 63 6b 5c 73 73 68 6f 75 6c 64 5c 73 scheck\sshould\s
01f0: 61 74 5c 73 6c 65 61 73 74 5c 73 62 65 5c 73 64 at\sleast\sbe\sd
0200: 6f 6e 65 5c 73 70 72 65 2d 63 6f 6d 6d 69 74 2c one\spre-commit,
0210: 5c 73 49 5c 73 74 68 69 6e 6b 2e 5c 72 5c 6e 5c \sI\sthink.\r\n\
0220: 72 5c 6e 28 32 29 5c 73 53 68 6f 75 6c 64 5c 73 r\n(2)\sShould\s
0230: 63 6f 6e 66 6c 69 63 74 5c 73 72 65 73 6f 6c 75 conflict\sresolu
0240: 74 69 6f 6e 5c 73 62 65 5c 73 69 6d 70 6c 69 63 tion\sbe\simplic
0250: 69 74 5c 73 6f 72 5c 73 65 78 70 6c 69 63 69 74 it\sor\sexplicit
0260: 3f 5c 73 49 27 6d 5c 73 6e 6f 74 5c 73 61 5c 73 ?\sI'm\snot\sa\s
0270: 66 61 6e 5c 73 6f 66 5c 73 74 68 65 5c 73 4d 65 fan\sof\sthe\sMe
0280: 72 63 75 72 69 61 6c 5c 73 61 70 70 72 6f 61 63 rcurial\sapproac
0290: 68 5c 73 6f 66 5c 73 65 78 70 6c 69 63 69 74 5c h\sof\sexplicit\
02a0: 73 22 68 67 5c 73 72 65 73 6f 6c 76 65 22 2c 5c s"hg\sresolve",\
02b0: 73 62 75 74 5c 73 69 74 5c 73 68 61 73 5c 73 69 sbut\sit\shas\si
02c0: 74 73 5c 73 6d 65 72 69 74 73 5c 73 74 6f 6f 2e ts\smerits\stoo.
02d0: 5c 73 41 74 5c 73 74 68 65 5c 73 76 65 72 79 5c \sAt\sthe\svery\
02e0: 73 6c 65 61 73 74 2c 5c 73 69 74 5c 73 77 6f 75 sleast,\sit\swou
02f0: 6c 64 5c 73 6d 61 6b 65 5c 73 74 68 65 5c 73 73 ld\smake\sthe\ss
0300: 74 61 74 75 73 5c 73 6f 70 65 72 61 74 69 6f 6e tatus\soperation
0310: 5c 73 76 65 72 79 5c 73 63 68 65 61 70 5c 73 61 \svery\scheap\sa
0320: 6e 64 5c 73 66 6f 72 63 65 5c 73 70 65 6f 70 6c nd\sforce\speopl
0330: 65 5c 73 74 6f 5c 73 6d 6f 72 65 5c 73 65 78 70 e\sto\smore\sexp
0340: 6c 69 63 69 74 5c 73 74 68 69 6e 6b 5c 73 61 62 licit\sthink\sab
0350: 6f 75 74 5c 73 69 74 2e 0a 4a 20 72 65 73 6f 6c out\sit..J resol
0360: 75 74 69 6f 6e 20 4f 70 65 6e 0a 4b 20 32 34 65 ution Open.K 24e
0370: 31 65 37 38 66 61 33 30 31 33 39 39 65 35 37 31 1e78fa301399e571
0380: 31 63 33 37 38 36 35 39 34 38 31 39 34 34 35 36 1c37865948194456
0390: 39 34 36 36 38 0a 55 20 61 6e 6f 6e 79 6d 6f 75 94668.U anonymou
03a0: 73 0a 5a 20 64 39 30 34 66 65 36 35 62 66 61 38 s.Z d904fe65bfa8
03b0: 39 35 31 66 31 64 37 65 66 62 33 33 61 61 32 64 951f1d7efb33aa2d
03c0: 34 39 32 61 0a 492a.