On Tue, Jan 11, 2011 at 4:14 PM, Doug Currie <doug.cur...@gmail.com> wrote:
> I dumped my small svn repo using svn-dump-fast-export from > http://barrbrain.github.com/ > and imported it using fossil import --git > Can you send me the output of svn-dump-fast-export via private email so that I can troubleshoot it? > > The repo was created but all of my svn checkins look like separate leaves, > all on branch: master. There is no ancestor. > > If I update to the first checkin, and try to merge the second, no dice: > > lsqlite_fswc e$ fossil update e4a88a1622 > ADD trunk/Makefile > ADD trunk/README > ADD trunk/lsqlite3.c > ADD trunk/lunit.lua > ADD trunk/test.lua > ADD trunk/tests-sqlite3.lua > -------------- > updated-to: e4a88a1622c32b3be854cdf06ba0505ebd35310c 2006-09-02 03:30:47 > UTC > tags: master, trunk > comment: Initial check-in from Tiago's 0.1 + e's recent changes. > (user: > e...@ecd9bf9a-ecc1-ed47-8102-3ce978d4cc14) > "fossil undo" is available to undo changes to the working checkout. > fossil: unfinalized SQL statement: [SELECT cid, 1 FROM plink WHERE pid=:pid > UNION ALL SELECT pid, 0 FROM plink WHERE cid=:pid] > lsqlite_fswc e$ fossil merge 98df42b25f > fossil: cannot find a common ancestor between the current checkout and > 98df42b25f > lsqlite_fswc e$ fossil merge --cherrypick 98df42b25f > fossil: cannot find an ancestor for 98df42b25f > > > Also note the error fossil: unfinalized SQL statement. > > Is there a way to fix this repo manually? The repo is small so I could also > fix it in the git-fast-export file, or in the sqlite database, if I knew > what was wrong. > > Should I use a different svn to git-fast-export tool? > > e$ fossil version > This is fossil version [f7cff4ad13] 2011-01-07 17:17:06.614 UTC > > Thanks. > > e > _______________________________________________ > fossil-users mailing list > fossil-users@lists.fossil-scm.org > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users > -- D. Richard Hipp d...@sqlite.org
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
