On 5/31/18, Offray Vladimir Luna Cárdenas <off...@riseup.net> wrote: > Hi, > > I have a fossil repository at [1] with two branches, resulting from a > fork. I have tried the usual `fossil update` and `fossil merge ID` but I > get this message: > > cannot find a common ancestor between the current checkout and f7e3308f63
The time-warp at http://mutabit.com/repos.fossil/dataweek/timeline?c=2018-04-13&n=20 is confusing the algorithm that selects a common answer for merges. There is a two-step solution. (1) Fix the timestamp on check-in 725609187bae1b2a79af72a59c3bec53a88dd870 so that it occurs at 2018-04-13 01:29:00 instead of at 2018-04-12 23:35:25. (2) Upgrade your Fossil binary to the lastest trunk version that includes this fix: https://www.fossil-scm.org/fossil/info/cf6fa2f34a1dd1ce After that, the merge will work. Thanks for the bug report. Probably I should enhance Fossil so that will successfully find the "pivot" (aka "most recent common ancestor") without the use of timestamp information. I have cloned a copy of your repository to use as a test case. The problem only arises when a timewarp causes one or more check-ins of a branch to appear prior to the pivot. -- D. Richard Hipp d...@sqlite.org _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
