On Sat, Aug 27, 2016 at 12:46 PM, Natacha Porté <nata...@instinctive.eu> wrote:
> Hello, > > 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. > > Now sometimes people send pull requests on github, and sometimes I find > them good, so for various reasons (mostly attribution) I accept them. > So I end up with a git repository that no longer a mirror of my fossil > repository, and I am looking for a way to get back to that state. > Since this is not frequent, maybe you could just merge the changes in your git working copy to your Fossil working copy, then "fossil commit --user-override" to commit the changes back to Fossil. You could also include the git commit ID in the commit comment or as a tag on the commit.
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
