Hi Gour, it's about importing an ancient project where all source code files are updates and branches to the same file, except no version control software was used at that time, and I'd like to import it so no history rewriting would happen. Instead of doing an actual merge of A2 and B2 into A3 another file is inserted as fake merge as A3, at the same time B2 continues after merge with additional changes as B3.
Marek -------- Original Message -------- From：Gour <g...@atmarama.net> Time：3/28/2012 08:36 To：fossil-users@lists.fossil-scm.org Subject：Re: [fossil-users] import of ancient projects On Wed, 28 Mar 2012 00:56:57 +0000 Marek <mlf.c...@gmail.com> wrote: > so far I've figured that A,B,C,D,E branching is possible (see > attachment from previous post) but I can't seem to figure out how to > fake insert A3 version instead of doing an actual merge and whether > it's possible to continue with the B branch after A3 merge. If the history went like a1 -> a2 -> a4 -> a5, then inserting a3 would mean rewriting the history and probably fossil does not allow it. Sincerely, Gour -- In this endeavor there is no loss or diminution, and a little advancement on this path can protect one from the most dangerous type of fear. http://atmarama.net | Hlapicina (Croatia) | GPG: 52B5C810 _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
