On 7/16/2015 11:12 PM, Andy Bradford wrote: > Thus said Andy Bradford on Thu, 16 Jul 2015 20:56:57 -0600: > >> Maybe rather than doing a pull, you could deconstruct both >> repositories, put the extracted artifacts into the same place, >> fabricate a manifest that somehow merges the two timelines with files >> from both trees? > > So I did both actually. I took two projects, pulled one into the other, > then deconstructed the new thing. I then created a manifest that had all > the requisite cards to ``merge'' the two independent trunks into one, > however, because I had a file name collision, I had to pick one of them. > Because they have no common ancestor, I don't think a diff can be > generated.
diff'ing shouldn't require a common ancestor. You're thinking of merging. merge's -baseline option lets you explicitly pick the common ancestor, which could be either trunk's initial empty check-in. -- Andy Goth | <andrew.m.goth/at/gmail/dot/com>
signature.asc
Description: OpenPGP digital signature
_______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
