Thus said B Harder on Wed, 18 Jun 2014 10:52:22 -0700: > 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 ?
How did you get to this error? In my case, I am able to cause it with the following test Fossil: http://fossil.bradfords.org:8080/ If you clone that and then try to merge the branch named ``four'' with trunk you'll get this error: $ fossil merge trunk cannot find a common ancestor between the current checkout and trunk The checkin in branch ``four'' is a merge with cherry picking of a part of trunk. What does the manifest for the checkin that gives the errorlook like? $ fossil artifact `fossil info | grep checkout | awk '{ print $2 }'` Andy -- TAI64 timestamp: 4000000053a1df8b _______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
