Dear Natacha, 2016-08-27 18:46 GMT+02:00 Natacha Porté: > Short version: I have a git repository built a mirror of a main > repository, a few changes happened to the git repository, and I would > like to find a way to bring these changes back to the fossil repository > so that the git repository can again be a simple mirror. > ....
Are patch files an option? - search a common base in git and fossil - checkout the fossil version - dump the changes to an unified diff/patch file e.g. 'git diff 7c000ae..e9250ff >export.diff' (or add .diff to URL in GitHub) - use patch e.g. 'patch -p1 -i export.diff' in the src root dir and commit your stuff in fossil to a new branch and merge or pick the changes. The other version: use both, git and fossil, to track your changes in a source tree. Make a full git clone and checkout an older version, which differs from a common code base in fossil and play around with 'fossil open repo $version --keep' and checkin your stuff step by step or as bulk to an new branch and merge it. I hope it will works for you, Kain _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
