: <i>The excellent branching wiki, needs a similar "how to merge" page...</i> plus 5 other changes
by
stephan
2023-01-17 17:01:16.
D 2023-01-17T17:01:16.017
J comment I\sfound\sthe\sbranching\spage\svery\suseful:\r\n<pre>\r\nhttp://www.fossil-scm.org/index.html/doc/tip/www/branching.wiki\r\n</pre>\r\nthank\syou\sfor\swriting\sthat.\r\n\r\nOne\sbit\sneeds\sexpanding\sfor\sthose\sof\sus\swho\sare\snew\sto\sversion\scontrol\sas\swell\sas\sfossil\s(just\sabove\sfigure\s3):\r\n\r\n<blockquote>\r\nTo\sresolve\sthis\ssituation,\sAlice\scan\suse\sthe\sfossil\s<b>merge</b>\scommand\sto\smerge\sin\sBob's\schanges\sin\sher\slocal\scopy\sof\scheck-in\s3.\sThen\sshe\scan\scommit\sthe\sresults\sas\scheck-in\s5.\sThis\sresults\sin\sa\stree\sas\sshown\sin\sfigure\s3.\r\n</blockquote>\r\n\r\n...but\show?!!!\r\n\r\nI\screated\sa\sfork\sin\sthe\smanner\sdescribed,\sbut\sit\sseems\sthat\sAlice\shas\sno\sindication\sthat\sBob\shas\smade\sa\sfork\sand\swould\shappily\scarry\son\son\sher\sown\smaking\smore\sand\smore\schanges...\sIs\sthere\ssome\sindicator\sI'm\smissing?\r\n\r\nIf\sshe\sdoes\sa\s<kbd>fossil\supdate</kbd>,\sI\scan\ssee\sthat\s<kbd>fossil\sdiff</kbd>\snotices\sa\schange,\sand\s<kbd>fossil\smerge</kbd>\ssays\sbad\sthings\shave\shappened,\sbut\sI\shave\sno\sidea\swhat\sto\sdo\sabout\sit...\r\n\r\nHere\sis\swhat\sI've\sbeen\sup\sto:\r\n<verbatim>\r\nC:\\tmp\\fossil>dir\r\n\sVolume\sin\sdrive\sC\shas\sno\slabel.\r\n\sVolume\sSerial\sNumber\sis\s4C8C-4143\r\n\r\n\sDirectory\sof\sC:\\tmp\\fossil\r\n\r\n22/05/2010\s\s08:42\sPM\s\s\s\s<DIR>\s\s\s\s\s\s\s\s\s\s.\r\n22/05/2010\s\s08:42\sPM\s\s\s\s<DIR>\s\s\s\s\s\s\s\s\s\s..\r\n22/05/2010\s\s08:38\sPM\s\s\s\s\s\s\s\s\s\s\s864,768\sfossil.exe\r\n22/05/2010\s\s08:41\sPM\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s209\smanifest\r\n22/05/2010\s\s08:41\sPM\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s41\smanifest.uuid\r\n22/05/2010\s\s08:41\sPM\s\s\s\s\s\s\s\s\s\s\s\s52,224\sTest.fossil\r\n22/05/2010\s\s08:40\sPM\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s32\sTest.txt\r\n\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s5\sFile(s)\s\s\s\s\s\s\s\s917,274\sbytes\r\n\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s2\sDir(s)\s\s61,822,676,992\sbytes\sfree\r\n\r\nC:\\tmp\\fossil>type\stest.txt\r\nLine\s1\r\nLine\s2\r\nLine\s3\r\nLine\s4\r\nC:\\tmp\\fossil>fossil\sopen\sTest.fossil\r\nTest.txt\r\nproject-name:\s<unnamed>\r\nrepository:\s\s\sC:/tmp/fossil/Test.fossil\r\nlocal-root:\s\s\sC:/tmp/fossil/\r\nuser-home:\s\s\s\sC:/Users/Alice/AppData/Local\r\nproject-code:\scd278cccb1fe96312af904be9d2fac0e942a777c\r\nserver-code:\s\s2b9fde97a0fdf6a42774b4417e325d201b783491\r\ncheckout:\s\s\s\s\s6b297dec4f5a51d94e53e416b8926ce84e7f79e2\s2010-05-22\s19:41:29\sUTC\r\nparent:\s\s\s\s\s\s\s5b5b6a6cc6ab0069b7c5edc3894a01f323ddf651\s2010-05-22\s19:18:34\sUTC\r\ntags:\s\s\s\s\s\s\s\s\strunk\r\n\r\nC:\\tmp\\fossil>type\stest.txt\r\nLine\s1\r\nLine\s2\r\nLine\s3\r\nLine\s4\r\nC:\\tmp\\fossil>fossil\scheckout\s--latest\r\n\r\nC:\\tmp\\fossil>type\stest.txt\r\nLine\s1\r\nLine\s2\r\nLine\s3\r\nLine\s4\r\nC:\\tmp\\fossil>fossil\supdate\r\nAutosync:\s\shttp://Ross@mesh-elite-d805:8080/Test.fossil\r\n\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\sBytes\s\s\s\s\s\sCards\s\sArtifacts\s\s\s\s\sDeltas\r\nSend:\s\s\s\s\s\s\s\s\s\s\s\s\s130\s\s\s\s\s\s\s\s\s\s1\s\s\s\s\s\s\s\s\s\s0\s\s\s\s\s\s\s\s\s\s0\r\nReceived:\s\s\s\s\s\s\s\s1012\s\s\s\s\s\s\s\s\s22\s\s\s\s\s\s\s\s\s\s0\s\s\s\s\s\s\s\s\s\s0\r\nTotal\snetwork\straffic:\s330\sbytes\ssent,\s737\sbytes\sreceived\r\n\r\nC:\\tmp\\fossil>type\stest.txt\r\nLine\s1\r\nLine\s2\r\nLine\s3\r\nLine\s4\r\nC:\\tmp\\fossil>fossil\smerge\se6fb455f91\r\nMERGE\sTest.txt\r\n*****\s1\smerge\sconflicts\sin\sTest.txt\r\n\r\nC:\\tmp\\fossil>fossil\sdiff\r\nIndex:\sTest.txt\r\n===================================================================\r\n---\sTest.txt\r\n+++\sTest.txt\r\n@@\s-1,4\s+1,6\s@@\r\n\sLine\s1\r\n\sLine\s2\r\n\sLine\s3\r\n-Line\s4\r\n+>>>>>>>\sBEGIN\sMERGE\sCONFLICT\r\n+Line\s5============================\r\n+Line\s4<<<<<<<\sEND\sMERGE\sCONFLICT\r\n\r\n\r\nC:\\tmp\\fossil>fossil\smerge\s--cherrypick\se6fb455f91\r\nMERGE\sTest.txt\r\n*****\s1\smerge\sconflicts\sin\sTest.txt\r\n</pre>\r\n\r\nWhat\sdoes\s--cherrypick\sdo?\r\n\r\nOh,\sand\sBob's\sTest.txt\slooks\slike\sthis:\r\n<pre>\r\nLine\s1\s\r\nLine\s2\s\r\nLine\s3\r\nLine\s5\r\n</verbatim>\r\n\r\nSo\show\sis\sAlice\sto\sknow\sBob\smade\sa\sfork\s(without\shaving\sto\slook\son\sthe\sweb\spage\sfor\sBranches\sbefore\sediting\severy\sfile)?\r\n\r\nShe\spresumably\shas\sto\suse\sthe\sBranches\spage\sto\sfind\sout\sthe\sversion\sof\sher\sprong\sof\sthe\sfork\sto\sdo\sthe\smerge,\sbut\show\sdoes\sshe\sactually\sdo\sthe\smerge?\n\n<hr><i>anonymous\sclaiming\sto\sbe\sArnel\sadded\son\s2010-05-23\s17:00:51:</i><br>\nAlice\sneeds\sto\sdo\sa\s<tt>fossil\spull</tt>\sto\supdate\sher\srepo\swith\sthe\schanges,\sthen\sshe\scan\sdo\sa\s<tt>fossil\smerge</tt>.\r\n\r\nIf\sthere\sare\sconflicts\sthat\sFossil\scannot\sresolve\son\sits\sown\s(like\schanges\smade\son\sthe\ssame\sline),\syou\smay\sneed\sto\sstep\sin\sand\sresolve\sthe\sconflicts\syourself.\n\n<hr><i>anonymous\sadded\son\s2010-05-23\s19:47:41:</i><br>\nThat's\sso\scool!\sIt\sdefinitely\sneeds\sexplaining\sand\sshowing\soff!\r\n\r\nI\sexpected\sAlice\sto\shave\sto\snotice\sthat\sa\sfork\shad\shappened,\ssomehow,\sthen\scopy\sher\slocal\sTest.txt\selsewhere\sso\sit\sdidn't\sget\soverwritten,\sthen\spull,\sthen\suse\ssome\sdiff\sapp\slike\skdiff3\sto\scompare\sthe\stwo\sversions...\r\n\r\nbut\sall\sthat\shappens\sis\sthat\sfossil\sadds\sMERGE\sCONFLICT\sto\sthe\sfile\sin\sthe\sproblem\sareas,\sso\sshe\scan\ssearch\sfor\sthose\sand\sedit\sin\sjust\sthe\sone\sfile.\r\n\r\nChecked-in\sbinaries\sare,\sI\sguess,\sa\swhole\sdifferent\sproblem?\r\n\r\nI\sneed\sto\stry\sit\sagain\sto\smake\ssure\sI've\sgot\sit:\sI\smerged\sbefore\spulling,\swhich\smay\shave\smade\sit\sso\sAlice\sdidn't\sneed\sto\srealise\sthere\swas\sa\sfork...
J icomment Closing\sbecause\sthe\sdocumentation\shas\sbeen\ssignificantly\soverhauled\ssince\sthis\sticket\swas\sopened.
J login stephan
J mimetype text/x-fossil-wiki
J resolution Overcome_By_Events
J status Closed
K 58339f7b10de7c67e09ef41ba9d90c7dc4c972f1
U stephan
Z 4e8ab30781746af00649baa00602cb88