On Wed, Jun 18, 2014 at 1:52 PM, B Harder <[email protected]> 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 [email protected]
_______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
