Hi,
FYI, this is on Windows in the Tk repository:
http://core.tcl.tk/tk/
I get an endless loop in fossil as follows:
C:\Users\francois\Documents\Development\tcltk-fossil\tk>fossil version
This is fossil version 1.35 [3aa86af6aa] 2016-06-14 11:10:39 UTC
C:\Users\francois\Documents\Development\tcltk-fossil\tk>fossil status
repository:
C:/Users/francois/Documents/Development/tcltk-fossil/tk/../tk.fossil
local-root: C:/Users/francois/Documents/Development/tcltk-fossil/tk/
config-db: C:/Users/francois/AppData/Local/_fossil
checkout: 44e27f3e7b8f6b7e2916193fa35edb5c6d34dab3 2017-01-25
22:05:51 UTC
parent: bfb8e49e36e348536b46afb72fa0029645dc921d 2017-01-23
09:45:18 UTC
child: b20b6d95b46553a7eb856529faf5d3d440fcde0b 2017-03-26
15:14:51 UTC
merged-into: 8912c3c5a73ccd7b684e52403094e5c8d0903cb0 2017-01-25
22:08:59 UTC
tags: core-8-5-branch
comment: Fix [140ea8ab38]: Long text lines are not drawn on
Windows. (user: pspjuth)
C:\Users\francois\Documents\Development\tcltk-fossil\tk>fossil merge
--dry-run --baseline 1896a918 tip-464
^C
(I had to cancel it manually: 100% CPU for many many minutes)
C:\Users\francois\Documents\Development\tcltk-fossil\tk>fossil-1.33.exe
merge --dry-run --baseline 1896a918 tip-464
UPDATE generic/ks_names.h
UPDATE xlib/X11/keysymdef.h
MERGE doc/keysyms.n
MERGE win/tkWinKey.c
REMINDER: this was a dry run - no files were actually changed.
(processed the command lickity split, with correct output)
So it works with fossil-1.33 but not with 1.35.
Is this problem known? It looks fixed with 2.1 (but it's much slower
than with 1.33):
C:\Users\francois\Documents\Development\tcltk-fossil\tk>fossil-2.1.exe
merge --dry-run --baseline 1896a918 tip-464
UPDATE generic/ks_names.h
UPDATE xlib/X11/keysymdef.h
MERGE doc/keysyms.n
MERGE win/tkWinKey.c
REMINDER: this was a dry run - no files were actually changed.
You can try it on the above given repo.
Thanks,
Francois
_______________________________________________
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
