On 05/29/2017 11:35 PM, The Tick wrote: > On 5/29/2017 10:30 PM, Andy Bradford wrote: >> Thus said Stephan Beal on Tue, 30 May 2017 02:57:38 +0200: >> >>> However, there is _hypothetically_ a way to completely merge 2 repos >>> into one while keeping all commits, but i'm not at all certain if this >>> would work... >> >> I think it actually will work for some definition of ``work''. I've done >> it before. >> >> But... it depends on what one expects out of it. >> >> There will be 2 separate and independent timelines once reconstructed >> and there will not be a relationship between artifacts except for the >> fact that they all live in the same Fossil file. >> > > From this I gather that there would be no way to connect the imported > repository onto the main trunk. That was not what I was hoping for. > > If I decide to do it, I'll probably look into a shell script to > checkout each commit, then add and commit to the target repository. > Have you considered the "reparent" subcommand?
Usage: fossil reparent [OPTIONS] CHECK-IN PARENT .... * **Create a "parent" tag that causes CHECK-IN to be interpreted as a** **child of PARENT.* If multiple PARENTs are listed, then the first is the primary parent and others are merge ancestors. This is an experts-only command. *It is used to patch up a repository* that has been damaged by a shun or *that has been pieced together from** **two or more separate repositories**.* You should never need to reparent during normal operations.
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
