On Wed, Oct 17, 2012 at 9:15 AM, Gour <[email protected]> wrote: > On Mon, 15 Oct 2012 09:13:44 -0400 > Richard Hipp <[email protected]> wrote: > > > See - here you got to the latest check-in. Notice that this check-in > > is *not* taked with "trunk". It's part of a different branch, > > somehow or another. > > My Git history is 100% linear and single branch. > > However, import from Git into Fossil show two branches and one is 'as > without origin' - see fossil-init.jpg - so I cannot merge the two not > having common ancestor. > > Moreover, Fossil import skipped one revision marked as > > #tryton -->on, #geany --> off & update logs > > (compare git.jpg with fossil.jpg) which happens right after the 'split'. > > Any idea and/or what to do to somehow merge those two 'branches' ? >
There must be some quirk or hiccup in the fast-export data that is causing Fossil to be unable to interpret the missing revision. And that missing revision in turn causes the linear sequence of check-ins to be split into two. Without seeing the fast-export content, I cannot speculate on what that quirk or hiccup might be. > > Otherwise, the conversion should be pretty straightforward - 110 > revisions in a single linear tree... > > Sincerely, > Gour > > -- > He who is satisfied with gain which comes of its own accord, who > is free from duality and does not envy, who is steady in both > success and failure, is never entangled, although performing actions. > > http://www.atmarama.net | Hlapicina (Croatia) | GPG: 52B5C810 > > _______________________________________________ > fossil-users mailing list > [email protected] > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users > > -- D. Richard Hipp [email protected]
_______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
