On Wed, Mar 18, 2015 at 12:19 PM, bch <brad.har...@gmail.com> wrote: > Scott -- if there's a case you concoct (and post) that demonstrates > the issue, more eyeballs and brains can review. >
I posted a Reader's Digest condensed one earlier, but here it is in more detail: 1. From an opened working directory of fossil, run fossil update 44a160a341 (the most recent winsymlink branch prior to one I updated earlier today). 2. Next, fossil merge a7e1101d71 (merge the last almost five months of trunk updates). 3. Observe that there are merge conflicts for src/file.c, src/update.c, and src/vfile.c. 4. Open src/file.c and go to BEGIN MERGE CONFLICT at line 295. 4a. The "local copy shown first" portion is fine. It shows exactly the body of the file_wd_perm function from the original version of the file. Diff src/file.c against src/file.c-original and you should see it immediately (or at least I did with WinMerge). 4b. The "COMMON ANCESTOR" portion is missing #endif from line 259 of the baseline version of the file. Diff src/file.c against src/file.c-baseline to see the missing line. 4c. The "MERGED IN" portion is missing #endif from line 249 of the merge version of the file. Diff src/file.c against src/file.c-merge to see the missing line. So if you discard the COMMON ANCESTOR and MERGED IN versions, you'll have a a "complete" body. If you discard the "local copy" and keep one of COMMON ANCESTOR or MERGED IN, you'll have an incomplete body. If you look at it for an hour or so trying to make sense of which if any pieces of each version you should include, you'll be quite confused as you try to come to terms with your first merge conflict and simultaneous uncertainty about the meanings "COMMON ANCESTOR" / baseline and "MERGED IN" / merge and "local copy" / original and where to find all this in src/file.c. Or at least I was. It was a perfect storm. Confusing changes between trunk & branch & some sleep deprivation experiment my body is forcing me into took me a while to come to the realization I shared above. -- Scott Robison
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
