Hello,

I have been maintaining git mirrors of the fossil repositories of my
personal projects, so that they can be more easily found (on github)
and/or cloned. Here is the snipped of shell script I use to build the
git mirror repository:

cd "${GIT_REPO}"
git init
fossil export --git -R "${FOSSIL_REPO}" \
    | sed 's/nat <nat>/Natasha Kerensikova <nata...@instinctive.eu>/' \
    | git fast-import
git remote add origin g...@github.com:faelys/${PROJ}.git

and here is the update snippet:

cd "${GIT_REPO}"
fossil pull -R "${FOSSIL_REPO}"
fossil export --git -R "${FOSSIL_REPO}" \
    | sed 's/nat <nat>/Natasha Kerensikova <nata...@instinctive.eu>/' \
    | git fast-import
git push --all origin


This is quite unrefined, but it mostly works well enough for me.

Now the problem is that some of my projects had their git repository
changed, for reasons mostly related to my own negligence, but that's how
it is.

I haven't touched the original fossil repository since, in the hope that
the situation can still somehow be salvaged.

So to make it short, the fossil repository is a prefix of what the git
mirror currently is, with the extra git nodes being generated by git.

Is there any way to backport the git commits into the fossil repository
and still have an automatic script to push to the git mirror?

Ideally it would still work with the script above, but from my foggy
memory of this list there is currently no round-trip support, and my
`sed` call in there probably murks things even further.

So a more realistic request would a procedure to backport the git
commits into fossil, and a new update script to only export stuff beyond
the synchronization point.

Would the "export-marks" feature be what I need? I haven't really
understood what it is and how it works.



Thanks in advance for your help,
Natasha

Attachment: pgpjR_2DpR_VS.pgp
Description: PGP signature

_______________________________________________
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Reply via email to