Fossil does its export in timestamp order.  (Key source line here:
https://www.fossil-scm.org/fossil/artifact/20d1516bc?ln=611)  But Jan
did a check-in with a bad timestamp.  (See
https://core.tcl.tk/tcl/timeline?unhide=on&n=25&y=ci&c=567e61b329c6b6f7872f)
 That caused the MARKs to occur out-of-order.  Jan subsequently fixed
the timestamp on the check-in (see
https://core.tcl.tk/tcl/info/a0ad546f77dfc5a2) so the export should be
working now.

Andreas - please confirm that the export has been working ever since
Jan fixed the timestamp on 2018-04-25.

I suppose a proper fix would be to change the ORDER BY clause to cause
the check-ins to be scanned in a dependency order, rather than in
chronological order.  I'm not sure exactly what that SQL would be,
though....


On 5/2/18, Andreas Kupries <andreas.kupr...@suse.com> wrote:
>
>
> Begin forwarded message:
>
> Date: Wed, 02 May 2018 16:32:23 +0200
> From: "Dipl. Ing. Sergey G. Brester via Tcl-Core"
> <tcl-c...@lists.sourceforge.net> To: Tcl List Core
> <tcl-c...@lists.sourceforge.net> Cc: akupr...@shaw.ca
> Subject: [TCLCORE] FOSSIL export fails again
>
>
>
>
> I think, this time it is rather a bug of "fossil export", but I'm not
> sure and anyway I cannot post a ticket to fossil-scm.org (have no
> account there), so I'm glad if someone could open a ticket there for
> me...
>
> Back to the issue:
> Export (resp. import on git) of the tcl-repository fails since
> 2018-04-23, after commit jan.nijtmans 1524612720 +0000 "Merge 8.6
> (bug-fix and test-case for Tcl_UtfAtIndex with TCL_UTF_MAX=4)" (or
> through later modifications of it):
>
> $ fossil export --git --import-marks .git/.fossil2git-fssl
> --export-marks .git/.fossil2git-fssl.tmp | git fast-import ...
>
> FATAL: MARK :108962 NOT DECLARED
> fast-import: dumping crash report to .git/fast_import_crash_9136
>
> The same occurs also using whole not partial export (with empty
> import-marks file) and for all fossil versions (1.34 - 2.5).
>
> IMHO, the reason for this bug is a wrong place of the mark 108962 (which
> takes place after the first usage), see the the last (blue marked) block
> in the excerpt below.
>
> Moving of this last commit-block to the head of the excerpt (before
> commit of mark 108961) solves the issue, and the import works fine.
>
> Of course, I can rewrite my own scripts (filters) to ignore revisions
> that belong to refs "mistake" (and I'll do it), but a bug remains a bug.
>
> Regards,
> Sergey.
>
> <<< EXCERPT FROM OUTPUT OF "FOSSIL EXPORT" >>>
>
> commit refs/heads/mistake
> mark :108961
> committer jan.nijtmans <jan.nijtmans> 1524527040 +0000
> data 9
> Merge 8.7
> from :108959
> MERGE :108962
> M 100644 :86010 generic/tclUtf.c
> M 100644 :86012 tests/string.test
> M 100644 :86012 tests/string.test
>
> commit refs/heads/mistake
> mark :108963
> committer dgp <dgp> 1524575566 +0000
> data 9
> merge 8.7
> from :108882
> MERGE :108962
> M 100644 :84587 doc/StringObj.3
> M 100644 :83725 doc/ToUpper.3
> M 100644 :83734 doc/Utf.3
> M 100644 :85313 doc/array.n
> M 100644 :84701 generic/tcl.decls
> M 100644 :85740 generic/tcl.h
> M 100644 :86029 generic/tclCmdMZ.c
> M 100644 :85878 generic/tclCompCmds.c
> M 100644 :85614 generic/tclDecls.h
> M 100644 :86009 generic/tclEncoding.c
> M 100644 :86020 generic/tclExecute.c
> M 100644 :85887 generic/tclInt.h
> M 100644 :85873 generic/tclStringObj.c
> M 100644 :85897 generic/tclTrace.c
> M 100644 :86010 generic/tclUtf.c
> M 100644 :86016 generic/tclVar.c
> M 100644 :85867 library/http/http.tcl
> M 100644 :85884 library/http/pkgIndex.tcl
> M 100644 :85880 tests/msgcat.test
> M 100644 :78579 tests/set-old.test
> M 100644 :86003 tests/string.test
> M 100644 :86017 tests/var.test
> M 100644 :85903 unix/Makefile.in
> M 100644 :85905 win/Makefile.in
> M 100644 :86029 generic/tclCmdMZ.c
> M 100644 :86020 generic/tclExecute.c
>
> commit refs/heads/mistake
> mark :108964
> committer dgp <dgp> 1524575864 +0000
> data 71
> Empty checkin to try to isolate timestamp damage in the parent checkin.
> FROM :108962
>
> ...
>
> commit refs/heads/trunk
> mark :108970
> committer andy <andy> 1524610856 +0000
> data 10
> Merge fork
> from :108967
> merge :108890
> M 100644 :86007 doc/define.n
>
> commit refs/heads/mistake
> MARK :108962
> committer jan.nijtmans <jan.nijtmans> 1524612720 +0000
> data 71
> Merge 8.6 (bug-fix and test-case for Tcl_UtfAtIndex with TCL_UTF_MAX=4)
> from :108958
> merge :108960
> M 100644 :86010 generic/tclUtf.c
> M 100644 :86003 tests/string.test
> M 100644 :86010 generic/tclUtf.c
> M 100644 :86003 tests/string.test
>
> <<< /EXCERPT >>>
>
>
>


-- 
D. Richard Hipp
d...@sqlite.org
_______________________________________________
fossil-dev mailing list
fossil-dev@mailinglists.sqlite.org
http://mailinglists.sqlite.org/cgi-bin/mailman/listinfo/fossil-dev

Reply via email to