On Fri, Jan 18, 2013 at 12:01 PM, John Griessen <[email protected]>wrote:
> Hi, I imported a project history from git and it seems I skipped a step > since when I do > fossil branch ls > it shows I am not on a branch. > > A new checkout in a different dir by doing > > fossil open ../tek_7k_flex.fossil shows I am on trunk when I do > fossil branch ls > in that dir. > > I tried using merge: > > fossil merge 9b98598fe1 > fossil: cannot find a common ancestor between the current checkout and > 9b98598fe1 > This indicates that you have two separate DAGs of development. That might result because (1) your git tree had two independent DAGs or (2) the import failed somehow - probably skipping a single commit someplace that connected the two DAGs together. > > fossil merge 9b98598fe1bc4fd6492cc48953de37**5bcd9241c7 > fossil: cannot find a common ancestor between the current checkout and > 9b98598fe1bc4fd6492cc48953de37**5bcd9241c7 > > > The timeline view shows one line with tags trunk, etcetera, user is > [email protected] > The other timeline has no tags, user john > > What to do to write the floating timeline onto trunk? > > John > ______________________________**_________________ > fossil-users mailing list > [email protected].**org <[email protected]> > http://lists.fossil-scm.org:**8080/cgi-bin/mailman/listinfo/**fossil-users<http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users> > -- D. Richard Hipp [email protected]
_______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
