I'm basically working with Tk8.7 and specifically a combination of several branches.
here's what I'm doing:
fossil clone https://core.tcl-lang.org/tk Tk.fossil
mkdir customTk
cd customTk
fossil open ../Tk.fossil
fossil update mac_styles_87
fossil merge glyph_indexing_2
I do that in order to work with glyph_indexing_2 (which provide emoji support) and mac_styles_87 (which is IMHO the best branch for macOS)
but before that I need to ask Jan to merge everything from Tk's trunk to glyph_indexing_2 and Marc to merge Tk's trunk to mac_styles_87
and I'm aware it could be boring for them (and everyone else that reading tickets...)
so, which fossil command should I invoke in order to merge trunk into glyph_indexing_2 and trunk into mac_styles_87?
Le 18/11/2021 à 14:29, Nicolas a écrit :
I'm basically working with Tk8.7 and specifically a combination of several branches.
here's what I'm doing:
fossil clone https://core.tcl-lang.org/tk Tk.fossil
mkdir customTk
cd customTk
fossil open ../Tk.fossil
fossil update mac_styles_87
fossil merge glyph_indexing_2
I do that in order to work with glyph_indexing_2 (which provide emoji support) and mac_styles_87 (which is IMHO the best branch for macOS)
but before that I need to ask Jan to merge everything from Tk's trunk to glyph_indexing_2 and Marc to merge Tk's trunk to mac_styles_87
and I'm aware it could be boring for them (and everyone else that reading tickets...)
so, which fossil command should I invoke in order to merge trunk into glyph_indexing_2 and trunk into mac_styles_87?Well, you almost wrote it above, unless I don't understand your
question. I would just merge two branches into the third one:
fossil update mac_styles_87
fossil merge trunk
fossil merge glyph_indexing_2
Wouldn't this give you the result? Merging trunk twice (once into glyph_indexing_2 and once into mac_styles_87) seems useless since the
same info would be considered twice. What am I missing?
Regards,
Francois
Sysop: | Keyop |
---|---|
Location: | Huddersfield, West Yorkshire, UK |
Users: | 307 |
Nodes: | 16 (2 / 14) |
Uptime: | 65:55:51 |
Calls: | 6,915 |
Files: | 12,379 |
Messages: | 5,431,689 |