Re: [fossil-users] Unnable to merge: Cannot find a common ancestor between the current checkout and ID
On 6/4/18, Richie Adler wrote: > Richard, > > I'm having now the same problem in my repository at > https://chiselapp.com/user/richieadler/repository/axxoneval/ > > I'm trying to merge the branch "mejorasilus" into trunk. I just encountered this problem on the SQLite repository, which enabled me to locate and fix a bug that I introduced 5 days ago when I fixed Offray's original problem. Please recompile from trunk and let me know if you encounter any new troubles. -- 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
Re: [fossil-users] Unnable to merge: Cannot find a common ancestor between the current checkout and ID
On 6/4/18, Richie Adler wrote: > Richard, > > I'm having now the same problem in my repository at > https://chiselapp.com/user/richieadler/repository/axxoneval/ > > I'm trying to merge the branch "mejorasilus" into trunk. When I look at your timeline, I see the "mejorasilus" has already been merged into trunk, and then closed. -- 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
Re: [fossil-users] Unnable to merge: Cannot find a common ancestor between the current checkout and ID
Richard, I'm having now the same problem in my repository at https://chiselapp.com/user/richieadler/repository/axxoneval/ I'm trying to merge the branch "mejorasilus" into trunk. For "fossil stat" I get [...] checkout: 4541a5d4ba186d49dbc8e2f31ab91796fee90de3 2018-05-30 22:43:54 UTC parent: 0fa7991da7a851e7ab69c8b11217db666d467ef3 2018-05-26 00:20:26 UTC child:6f2cb868897367ce42ef2aeb5283e876bb8fd6eb 2018-06-03 17:30:43 UTC tags: trunk comment: Bugfix: modified_on=request.now al poner a cero las evaluaciones (user: Kilroy) >f merge mejorasilus Autosync: http://richiead...@chiselapp.com/user/richieadler/repository/axxoneval Round-trips: 1 Artifacts sent: 0 received: 0 Pull done, sent: 405 received: 2377 ip: 74.208.146.128 cannot find a common ancestor between the current checkout and mejorasilus >f merge 82494c4441 Autosync: http://richiead...@chiselapp.com/user/richieadler/repository/axxoneval Round-trips: 1 Artifacts sent: 0 received: 0 Pull done, sent: 407 received: 2378 ip: 74.208.146.128 cannot find a common ancestor between the current checkout and 82494c4441 You should be able to access anonymously to the repository... any ideas? Compiled in Windows 7 with MinGW. This is fossil version 2.6 [f39d0a7290] 2018-06-04 19:52:53 UTC ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] Unnable to merge: Cannot find a common ancestor between the current checkout and ID
On 31/05/18 10:22, Richard Hipp wrote: > On 5/31/18, Richard Hipp wrote: >> 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. > That fix is now on trunk. So if you rebuild your local Fossil using > the latest sources, the merge should no just work - without having to > correct the timewarp. > > Thanks Richard. I will do it this weekend. Cheers, Offray ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] Unnable to merge: Cannot find a common ancestor between the current checkout and ID
On 5/31/18, Richard Hipp wrote: > > 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. That fix is now on trunk. So if you rebuild your local Fossil using the latest sources, the merge should no just work - without having to correct the timewarp. -- 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
Re: [fossil-users] Unnable to merge: Cannot find a common ancestor between the current checkout and ID
On 5/31/18, Offray Vladimir Luna Cárdenas 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
[fossil-users] Unnable to merge: Cannot find a common ancestor between the current checkout and ID
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 I have tried with the `--baseline ID` as advised in [2], but I get the message "lack both primary and secondary files", no matter the ID of the supposed common ancestor. At [2] there is a reference on shunning artifacts and I may have shunned something here, but I think that merging should work without not shunning as a prerequisite. [1] http://mutabit.com/repos.fossil/dataweek/ [2] https://stackoverflow.com/questions/19104534/fossil-scm-merge-leafs-back-to-trunk How can I merge these branches? Thanks, Offray ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
