IIRC this can happen if a file is created independently in both branches.
On Wed, Jun 18, 2014 at 10:55 AM, Richard Hipp <d...@sqlite.org> wrote: > > > > On Wed, Jun 18, 2014 at 1:52 PM, B Harder <brad.har...@gmail.com> wrote: > >> If everything is (ultimately) spawned from the "initial empty >> checkin", how can I be getting "WARNING - no common ancestor: <path>" >> when merging one branch into another ? >> > > Perhaps a "shun" broke the check-in chain somewhere along the way. > > There is the "fossil test-ancestor-path HASH1 HASH2" command that you can > use to find common ancestors between two arbitrary check-ins. Perhaps you > can use that to figure out where the problem sits. > > > -- > 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 > > -- Matt -=- 90% of the nations wealth is held by 2% of the people. Bummer to be in the majority...
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
