On 01/18/2013 11:01 AM, John Griessen 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.
Now I'm getting somewhere using this from the checkout of trunk:
fossil checkout a737f8589fbd35bbca85e8ef77f8522088e0c3c9 --keep
fossil branch ls
shows I'm on trunk. Latest is a last leaf of timeline. All good with my data.
Timeline still shows floating line. Used gui to tag it oops.
How to tidy that leaf and stop it from taking up space in timelines?
Thanks, John
On 01/18/2013 11:32 AM, Richard Hipp wrote:> 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.
I think the 2nd DAG started after I imported. As a new user, I just used
a command line to import from git
"git fast-export --all | fossil import --git new-repo.fossil"
then did these commands and got to that state:
fossil status
502 ls
503 cd
504 cd EEProjects/
505 ls
506 cd tek_7k_flex
507 fossil status
508 fossil ui
509 bg
510 fossil status
511 fossil extra
512 fossil update trunk
513 fossil undo
514 fossil add data
515 fossil add makefile
516 fossil remove tek-flex-18mar2010.html tek_7K_extender-netlist.gnumeric
517 fossil help
518 fossil rm tek-flex-18mar2010.html tek_7K_extender-netlist.gnumeric
519 fossil status
520 fossil commit -m "addremove more files for first git import"
521 fossil add data/7904A_main_connector_pinout.gif
522 fossil commit -m "addremove more files for first git import"
523 ll data/7904A_main_connector_pinout.gif
524 ls
525 ls data
526 ls
527 la
528 fossil rm .gitignore
529 rm -rf .git
The history in my terminal window doesn't go back all the way to the import.
_______________________________________________
fossil-users mailing list
[email protected]
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
