Artifact
37031e7c5daaf74485835b681321b0f8e4b4adf0:
Ticket change
[37031e7c5d]
- New ticket
[427938e2f6] three-way merge.
by
anonymous
2010-04-12 21:18:17.
0000: 44 20 32 30 31 30 2d 30 34 2d 31 32 54 32 31 3a D 2010-04-12T21:
0010: 31 38 3a 31 37 0a 4a 20 63 6f 6d 6d 65 6e 74 20 18:17.J comment
0020: 49 5c 73 77 6f 75 6c 64 5c 73 6c 69 6b 65 5c 73 I\swould\slike\s
0030: 74 6f 5c 73 72 65 71 75 65 73 74 5c 73 73 75 70 to\srequest\ssup
0040: 70 6f 72 74 5c 73 66 6f 72 5c 73 33 2d 77 61 79 port\sfor\s3-way
0050: 5c 73 6d 65 72 67 65 5c 73 75 73 69 6e 67 5c 73 \smerge\susing\s
0060: 65 78 74 65 72 6e 61 6c 5c 73 64 69 66 66 5c 73 external\sdiff\s
0070: 74 6f 6f 6c 5c 73 69 6e 73 74 65 61 64 5c 73 6f tool\sinstead\so
0080: 66 5c 73 74 68 65 5c 73 64 65 66 61 75 6c 74 5c f\sthe\sdefault\
0090: 73 61 75 74 6f 2d 6d 65 72 67 65 2e 5c 73 54 68 sauto-merge.\sTh
00a0: 65 5c 73 66 65 61 74 75 72 65 5c 73 63 61 6e 5c e\sfeature\scan\
00b0: 73 62 65 5c 73 73 65 65 6e 5c 73 66 6f 72 5c 73 sbe\sseen\sfor\s
00c0: 65 78 61 6d 70 6c 65 5c 73 69 6e 5c 73 5b 68 74 example\sin\s[ht
00d0: 74 70 3a 2f 2f 64 6f 63 2e 62 61 7a 61 61 72 2e tp://doc.bazaar.
00e0: 63 61 6e 6f 6e 69 63 61 6c 2e 63 6f 6d 2f 6c 61 canonical.com/la
00f0: 74 65 73 74 2f 65 6e 2f 75 73 65 72 2d 67 75 69 test/en/user-gui
0100: 64 65 2f 72 65 73 6f 6c 76 69 6e 67 5f 63 6f 6e de/resolving_con
0110: 66 6c 69 63 74 73 2e 68 74 6d 6c 7c 62 61 7a 61 flicts.html|baza
0120: 61 72 5c 73 64 6f 63 73 5d 5c 73 6f 72 5c 73 5b ar\sdocs]\sor\s[
0130: 68 74 74 70 3a 2f 2f 77 77 77 2e 70 65 72 66 6f http://www.perfo
0140: 72 63 65 2e 63 6f 6d 2f 70 65 72 66 6f 72 63 65 rce.com/perforce
0150: 2f 70 72 6f 64 75 63 74 73 2f 6d 65 72 67 65 2e /products/merge.
0160: 68 74 6d 6c 7c 70 65 72 66 6f 72 63 65 5c 73 77 html|perforce\sw
0170: 65 62 5d 5c 73 61 6e 64 5c 73 77 61 73 5c 73 64 eb]\sand\swas\sd
0180: 69 73 63 75 73 73 65 64 5c 73 5b 68 74 74 70 3a iscussed\s[http:
0190: 2f 2f 77 77 77 2e 6d 61 69 6c 2d 61 72 63 68 69 //www.mail-archi
01a0: 76 65 2e 63 6f 6d 2f 66 6f 73 73 69 6c 2d 75 73 ve.com/fossil-us
01b0: 65 72 73 40 6c 69 73 74 73 2e 66 6f 73 73 69 6c ers@lists.fossil
01c0: 2d 73 63 6d 2e 6f 72 67 2f 6d 73 67 30 31 38 35 -scm.org/msg0185
01d0: 34 2e 68 74 6d 6c 7c 6f 6e 5c 73 74 68 65 5c 73 4.html|on\sthe\s
01e0: 6d 61 69 6c 69 6e 67 5c 73 6c 69 73 74 5d 2e 5c mailing\slist].\
01f0: 72 5c 6e 5c 72 5c 6e 42 61 7a 61 61 72 5c 73 63 r\n\r\nBazaar\sc
0200: 72 65 61 74 65 73 5c 73 33 5c 73 66 69 6c 65 73 reates\s3\sfiles
0210: 5c 73 69 6e 5c 73 61 64 64 69 74 69 6f 6e 5c 73 \sin\saddition\s
0220: 74 6f 5c 73 74 68 65 5c 73 61 75 74 6f 2d 6d 65 to\sthe\sauto-me
0230: 72 67 65 64 5c 73 66 69 6c 65 2c 5c 73 77 68 69 rged\sfile,\swhi
0240: 63 68 5c 73 63 61 6e 5c 73 62 65 5c 73 70 61 73 ch\scan\sbe\spas
0250: 73 65 64 5c 73 74 6f 5c 73 74 68 65 5c 73 65 78 sed\sto\sthe\sex
0260: 74 65 72 6e 61 6c 5c 73 6d 65 72 67 65 5c 73 74 ternal\smerge\st
0270: 6f 6f 6c 2e 5c 73 41 5c 73 62 7a 72 5c 73 72 65 ool.\sA\sbzr\sre
0280: 73 6f 6c 76 65 5c 73 63 6f 6d 6d 61 6e 64 5c 73 solve\scommand\s
0290: 69 73 5c 73 74 68 65 6e 5c 73 63 61 6c 6c 65 64 is\sthen\scalled
02a0: 5c 73 77 68 69 63 68 5c 73 63 68 65 63 6b 73 5c \swhich\schecks\
02b0: 73 74 68 65 5c 73 6d 65 72 67 65 64 5c 73 66 69 sthe\smerged\sfi
02c0: 6c 65 5c 73 61 6e 64 5c 73 64 65 6c 65 74 65 73 le\sand\sdeletes
02d0: 5c 73 74 68 65 5c 73 74 65 6d 70 6f 72 61 72 79 \sthe\stemporary
02e0: 5c 73 66 69 6c 65 73 2e 5c 72 5c 6e 50 65 72 66 \sfiles.\r\nPerf
02f0: 6f 72 63 65 5c 73 75 73 65 73 5c 73 69 6e 74 65 orce\suses\sinte
0300: 72 6e 61 6c 5c 73 6d 65 72 67 65 5c 73 74 6f 6f rnal\smerge\stoo
0310: 6c 5c 73 77 68 69 63 68 5c 73 61 63 63 65 73 73 l\swhich\saccess
0320: 65 73 5c 73 74 68 65 5c 73 72 65 70 6f 73 69 74 es\sthe\sreposit
0330: 6f 72 79 5c 73 64 69 72 65 63 74 6c 79 2e 5c 72 ory\sdirectly.\r
0340: 5c 6e 53 69 6e 63 65 5c 73 74 68 65 5c 73 50 65 \nSince\sthe\sPe
0350: 72 66 6f 72 63 65 2d 77 61 79 5c 73 77 6f 75 6c rforce-way\swoul
0360: 64 5c 73 72 65 71 75 69 72 65 5c 73 73 75 70 70 d\srequire\ssupp
0370: 6f 72 74 5c 73 66 6f 72 5c 73 61 63 63 65 73 73 ort\sfor\saccess
0380: 69 6e 67 5c 73 66 6f 73 73 69 6c 5c 73 72 65 70 ing\sfossil\srep
0390: 6f 73 5c 73 64 69 72 65 63 74 6c 79 2c 5c 73 61 os\sdirectly,\sa
03a0: 5c 73 72 65 61 73 6f 6e 61 62 6c 65 5c 73 77 61 \sreasonable\swa
03b0: 79 5c 73 77 6f 75 6c 64 5c 73 62 65 5c 73 75 73 y\swould\sbe\sus
03c0: 69 6e 67 5c 73 74 68 65 5c 73 74 65 6d 70 6f 72 ing\sthe\stempor
03d0: 61 72 79 5c 73 66 69 6c 65 73 5c 73 61 73 5c 73 ary\sfiles\sas\s
03e0: 62 61 7a 61 61 72 5c 73 64 6f 65 73 2e 5c 72 5c bazaar\sdoes.\r\
03f0: 6e 5c 72 5c 6e 4d 61 6e 79 5c 73 74 6f 6f 6c 73 n\r\nMany\stools
0400: 5c 73 61 72 65 5c 73 63 61 70 61 62 6c 65 5c 73 \sare\scapable\s
0410: 6f 66 5c 73 74 68 69 73 5c 73 74 79 70 65 5c 73 of\sthis\stype\s
0420: 6f 66 5c 73 6d 65 72 67 65 5c 73 28 6d 65 6c 64 of\smerge\s(meld
0430: 2c 5c 73 64 69 66 66 75 73 65 2c 5c 73 6b 64 69 ,\sdiffuse,\skdi
0440: 66 66 2c 5c 73 77 69 6e 6d 65 72 67 65 2c 5c 73 ff,\swinmerge,\s
0450: 2e 2e 2e 29 0a 4a 20 70 72 69 76 61 74 65 5f 63 ...).J private_c
0460: 6f 6e 74 61 63 74 20 35 38 64 37 66 30 39 33 32 ontact 58d7f0932
0470: 33 30 64 34 62 34 36 64 37 35 64 64 33 37 63 34 30d4b46d75dd37c4
0480: 66 34 38 65 37 30 39 61 39 65 64 31 34 30 30 0a f48e709a9ed1400.
0490: 4a 20 73 65 76 65 72 69 74 79 20 4d 69 6e 6f 72 J severity Minor
04a0: 0a 4a 20 73 74 61 74 75 73 20 4f 70 65 6e 0a 4a .J status Open.J
04b0: 20 74 69 74 6c 65 20 74 68 72 65 65 2d 77 61 79 title three-way
04c0: 5c 73 6d 65 72 67 65 0a 4a 20 74 79 70 65 20 46 \smerge.J type F
04d0: 65 61 74 75 72 65 5f 52 65 71 75 65 73 74 0a 4b eature_Request.K
04e0: 20 34 32 37 39 33 38 65 32 66 36 39 33 39 33 64 427938e2f69393d
04f0: 32 32 62 38 38 34 62 65 35 37 37 65 32 65 36 37 22b884be577e2e67
0500: 30 65 63 32 33 62 65 61 34 0a 55 20 61 6e 6f 6e 0ec23bea4.U anon
0510: 79 6d 6f 75 73 0a 5a 20 36 32 39 66 39 37 65 64 ymous.Z 629f97ed
0520: 33 66 65 30 30 63 62 62 64 65 64 39 33 30 32 66 3fe00cbbded9302f
0530: 31 38 63 39 31 32 36 39 0a 18c91269.