Fossil SCM

Merge latest changes from trunk

mgagnon 2021-04-26 15:37 vdiff-context-glob merge

Commit 700ae1075bb42ac7c13e1d0f70e007fe6e86787eaa3e4b2dff6b07c1b046e22b

Parent fab81968d1b5667…

6 files changed +35 -14 +1 -6 +59 +2 +4

~ src/merge.c ~ src/name.c ~ test/merge_renames.test ~ test/merge_renames_2.test ~ win/Makefile.mingw ~ win/Makefile.msc

M src/merge.c

+35 -14

		--- src/merge.c
		+++ src/merge.c
		@@ -618,28 +618,49 @@
618	618	** to B and B is renamed to A.
619	619	** The Fossil merge algorithm breaks down in those cases. It will need
620	620	** to be completely rewritten to handle such complex cases. Such cases
621	621	** appear to be rare, and also confusing to humans.
622	622	*/
	623	+ db_multi_exec(
	624	+ "UPDATE OR IGNORE fv SET fnp=vfile.pathname FROM vfile"
	625	+ " WHERE fnp IS NULL"
	626	+ " AND vfile.pathname = fv.fnn"
	627	+ " AND vfile.vid=%d;",
	628	+ pid
	629	+ );
623	630	db_multi_exec(
624	631	"UPDATE OR IGNORE fv SET fn=vfile.pathname FROM vfile"
625	632	" WHERE fn IS NULL"
626		- " AND vfile.pathname IN (fv.fnm,fv.fnp,fv.fnn)"
	633	+ " AND vfile.pathname = coalesce(fv.fnp,fv.fnn)"
627	634	" AND vfile.vid=%d;",
628	635	vid
	636	+ );
	637	+ db_multi_exec(
	638	+ "UPDATE OR IGNORE fv SET fnm=vfile.pathname FROM vfile"
	639	+ " WHERE fnm IS NULL"
	640	+ " AND vfile.pathname = coalesce(fv.fnp,fv.fnn)"
	641	+ " AND vfile.vid=%d;",
	642	+ mid
629	643	);
630	644	db_multi_exec(
631	645	"UPDATE OR IGNORE fv SET fnp=vfile.pathname FROM vfile"
632	646	" WHERE fnp IS NULL"
633		- " AND vfile.pathname IN (fv.fn,fv.fnm,fv.fnn)"
	647	+ " AND vfile.pathname IN (fv.fnm,fv.fn)"
634	648	" AND vfile.vid=%d;",
635	649	pid
	650	+ );
	651	+ db_multi_exec(
	652	+ "UPDATE OR IGNORE fv SET fn=vfile.pathname FROM vfile"
	653	+ " WHERE fn IS NULL"
	654	+ " AND vfile.pathname = fv.fnm"
	655	+ " AND vfile.vid=%d;",
	656	+ vid
636	657	);
637	658	db_multi_exec(
638	659	"UPDATE OR IGNORE fv SET fnm=vfile.pathname FROM vfile"
639	660	" WHERE fnm IS NULL"
640		- " AND vfile.pathname IN (fv.fn,fv.fnp,fv.fnn)"
	661	+ " AND vfile.pathname = fv.fn"
641	662	" AND vfile.vid=%d;",
642	663	mid
643	664	);
644	665	}
645	666	if( debugFlag ){
		@@ -702,25 +723,25 @@
702	723	db_multi_exec(
703	724	"UPDATE fv SET idp=idv, ridp=ridv WHERE ridv>0 AND chnged NOT IN (3,5)"
704	725	);
705	726	}else{
706	727	db_multi_exec(
707		- "UPDATE fv SET"
708		- " idp=coalesce((SELECT id FROM vfile WHERE vid=%d AND fnp=pathname),0),"
709		- " ridp=coalesce((SELECT rid FROM vfile WHERE vid=%d AND fnp=pathname),0)",
710		- pid, pid
	728	+ "UPDATE fv SET idp=coalesce(vfile.id,0), ridp=coalesce(vfile.rid,0)"
	729	+ " FROM vfile"
	730	+ " WHERE vfile.vid=%d AND fv.fnp=vfile.pathname",
	731	+ pid
711	732	);
712	733	}
713	734	db_multi_exec(
714	735	"UPDATE fv SET"
715		- " idm=coalesce((SELECT id FROM vfile WHERE vid=%d AND fnm=pathname),0),"
716		- " ridm=coalesce((SELECT rid FROM vfile WHERE vid=%d AND fnm=pathname),0),"
717		- " islinkm=coalesce((SELECT islink FROM vfile"
718		- " WHERE vid=%d AND fnm=pathname),0),"
719		- " isexe=coalesce((SELECT isexe FROM vfile WHERE vid=%d AND fnm=pathname),"
720		- " isexe)",
721		- mid, mid, mid, mid
	736	+ " idm=coalesce(vfile.id,0),"
	737	+ " ridm=coalesce(vfile.rid,0),"
	738	+ " islinkm=coalesce(vfile.islink,0),"
	739	+ " isexe=coalesce(vfile.isexe,fv.isexe)"
	740	+ " FROM vfile"
	741	+ " WHERE vid=%d AND fnm=pathname",
	742	+ mid
722	743	);
723	744
724	745	/*
725	746	** Update the execute bit on files where it's changed from P->M but not P->V
726	747	*/
727	748

	--- src/merge.c
	+++ src/merge.c
	@@ -618,28 +618,49 @@
618	** to B and B is renamed to A.
619	** The Fossil merge algorithm breaks down in those cases. It will need
620	** to be completely rewritten to handle such complex cases. Such cases
621	** appear to be rare, and also confusing to humans.
622	*/







623	db_multi_exec(
624	"UPDATE OR IGNORE fv SET fn=vfile.pathname FROM vfile"
625	" WHERE fn IS NULL"
626	" AND vfile.pathname IN (fv.fnm,fv.fnp,fv.fnn)"
627	" AND vfile.vid=%d;",
628	vid







629	);
630	db_multi_exec(
631	"UPDATE OR IGNORE fv SET fnp=vfile.pathname FROM vfile"
632	" WHERE fnp IS NULL"
633	" AND vfile.pathname IN (fv.fn,fv.fnm,fv.fnn)"
634	" AND vfile.vid=%d;",
635	pid







636	);
637	db_multi_exec(
638	"UPDATE OR IGNORE fv SET fnm=vfile.pathname FROM vfile"
639	" WHERE fnm IS NULL"
640	" AND vfile.pathname IN (fv.fn,fv.fnp,fv.fnn)"
641	" AND vfile.vid=%d;",
642	mid
643	);
644	}
645	if( debugFlag ){
	@@ -702,25 +723,25 @@
702	db_multi_exec(
703	"UPDATE fv SET idp=idv, ridp=ridv WHERE ridv>0 AND chnged NOT IN (3,5)"
704	);
705	}else{
706	db_multi_exec(
707	"UPDATE fv SET"
708	" idp=coalesce((SELECT id FROM vfile WHERE vid=%d AND fnp=pathname),0),"
709	" ridp=coalesce((SELECT rid FROM vfile WHERE vid=%d AND fnp=pathname),0)",
710	pid, pid
711	);
712	}
713	db_multi_exec(
714	"UPDATE fv SET"
715	" idm=coalesce((SELECT id FROM vfile WHERE vid=%d AND fnm=pathname),0),"
716	" ridm=coalesce((SELECT rid FROM vfile WHERE vid=%d AND fnm=pathname),0),"
717	" islinkm=coalesce((SELECT islink FROM vfile"
718	" WHERE vid=%d AND fnm=pathname),0),"
719	" isexe=coalesce((SELECT isexe FROM vfile WHERE vid=%d AND fnm=pathname),"
720	" isexe)",
721	mid, mid, mid, mid
722	);
723
724	/*
725	** Update the execute bit on files where it's changed from P->M but not P->V
726	*/
727

	--- src/merge.c
	+++ src/merge.c
	@@ -618,28 +618,49 @@
618	** to B and B is renamed to A.
619	** The Fossil merge algorithm breaks down in those cases. It will need
620	** to be completely rewritten to handle such complex cases. Such cases
621	** appear to be rare, and also confusing to humans.
622	*/
623	db_multi_exec(
624	"UPDATE OR IGNORE fv SET fnp=vfile.pathname FROM vfile"
625	" WHERE fnp IS NULL"
626	" AND vfile.pathname = fv.fnn"
627	" AND vfile.vid=%d;",
628	pid
629	);
630	db_multi_exec(
631	"UPDATE OR IGNORE fv SET fn=vfile.pathname FROM vfile"
632	" WHERE fn IS NULL"
633	" AND vfile.pathname = coalesce(fv.fnp,fv.fnn)"
634	" AND vfile.vid=%d;",
635	vid
636	);
637	db_multi_exec(
638	"UPDATE OR IGNORE fv SET fnm=vfile.pathname FROM vfile"
639	" WHERE fnm IS NULL"
640	" AND vfile.pathname = coalesce(fv.fnp,fv.fnn)"
641	" AND vfile.vid=%d;",
642	mid
643	);
644	db_multi_exec(
645	"UPDATE OR IGNORE fv SET fnp=vfile.pathname FROM vfile"
646	" WHERE fnp IS NULL"
647	" AND vfile.pathname IN (fv.fnm,fv.fn)"
648	" AND vfile.vid=%d;",
649	pid
650	);
651	db_multi_exec(
652	"UPDATE OR IGNORE fv SET fn=vfile.pathname FROM vfile"
653	" WHERE fn IS NULL"
654	" AND vfile.pathname = fv.fnm"
655	" AND vfile.vid=%d;",
656	vid
657	);
658	db_multi_exec(
659	"UPDATE OR IGNORE fv SET fnm=vfile.pathname FROM vfile"
660	" WHERE fnm IS NULL"
661	" AND vfile.pathname = fv.fn"
662	" AND vfile.vid=%d;",
663	mid
664	);
665	}
666	if( debugFlag ){
	@@ -702,25 +723,25 @@
723	db_multi_exec(
724	"UPDATE fv SET idp=idv, ridp=ridv WHERE ridv>0 AND chnged NOT IN (3,5)"
725	);
726	}else{
727	db_multi_exec(
728	"UPDATE fv SET idp=coalesce(vfile.id,0), ridp=coalesce(vfile.rid,0)"
729	" FROM vfile"
730	" WHERE vfile.vid=%d AND fv.fnp=vfile.pathname",
731	pid
732	);
733	}
734	db_multi_exec(
735	"UPDATE fv SET"
736	" idm=coalesce(vfile.id,0),"
737	" ridm=coalesce(vfile.rid,0),"
738	" islinkm=coalesce(vfile.islink,0),"
739	" isexe=coalesce(vfile.isexe,fv.isexe)"
740	" FROM vfile"
741	" WHERE vid=%d AND fnm=pathname",
742	mid
743	);
744
745	/*
746	** Update the execute bit on files where it's changed from P->M but not P->V
747	*/
748

M src/name.c

		--- src/name.c
		+++ src/name.c
		@@ -771,10 +771,11 @@
771	771	/* Report any symbolic tags on this artifact */
772	772	db_prepare(&q,
773	773	"SELECT substr(tagname,5)"
774	774	" FROM tag JOIN tagxref ON tag.tagid=tagxref.tagid"
775	775	" WHERE tagxref.rid=%d"
	776	+ " AND tagxref.tagtype<>0"
776	777	" AND tagname GLOB 'sym-*'"
777	778	" ORDER BY 1",
778	779	rid
779	780	);
780	781	cnt = 0;
781	782

	--- src/name.c
	+++ src/name.c
	@@ -771,10 +771,11 @@
771	/* Report any symbolic tags on this artifact */
772	db_prepare(&q,
773	"SELECT substr(tagname,5)"
774	" FROM tag JOIN tagxref ON tag.tagid=tagxref.tagid"
775	" WHERE tagxref.rid=%d"

776	" AND tagname GLOB 'sym-*'"
777	" ORDER BY 1",
778	rid
779	);
780	cnt = 0;
781

	--- src/name.c
	+++ src/name.c
	@@ -771,10 +771,11 @@
771	/* Report any symbolic tags on this artifact */
772	db_prepare(&q,
773	"SELECT substr(tagname,5)"
774	" FROM tag JOIN tagxref ON tag.tagid=tagxref.tagid"
775	" WHERE tagxref.rid=%d"
776	" AND tagxref.tagtype<>0"
777	" AND tagname GLOB 'sym-*'"
778	" ORDER BY 1",
779	rid
780	);
781	cnt = 0;
782

M test/merge_renames.test

-6

		--- test/merge_renames.test
		+++ test/merge_renames.test
		@@ -523,33 +523,27 @@
523	523
524	524	fossil update m1
525	525	fossil merge b
526	526	test_status_list merge_renames-13-6 $RESULT {
527	527	UPDATE f1
528		- DELETE f2n
529		- ADDED f2n
530	528	}
531	529	test_file_contents merge_renames-13-7 f2n "line1"
532	530
533	531	fossil revert
534	532	test_status_list merge_renames-13-8 $RESULT {
535	533	REVERT f1
536		- REVERT f2n
537	534	}
538	535	fossil update trunk
539	536	fossil merge --integrate b
540	537	test_status_list merge_renames-13-9 $RESULT {
541	538	UPDATE f1
542		- DELETE f2n
543		- ADDED f2n
544	539	}
545	540	test_file_contents merge_renames-13-10 f2n "line1"
546	541
547	542	fossil revert
548	543	test_status_list merge_renames-13-11 $RESULT {
549	544	REVERT f1
550		- REVERT f2n
551	545	}
552	546
553	547	######################################
554	548	#
555	549	# Tests for troubles not specifically linked with renames but that I'd like to
556	550
557	551	ADDED test/merge_renames_2.test

	--- test/merge_renames.test
	+++ test/merge_renames.test
	@@ -523,33 +523,27 @@
523
524	fossil update m1
525	fossil merge b
526	test_status_list merge_renames-13-6 $RESULT {
527	UPDATE f1
528	DELETE f2n
529	ADDED f2n
530	}
531	test_file_contents merge_renames-13-7 f2n "line1"
532
533	fossil revert
534	test_status_list merge_renames-13-8 $RESULT {
535	REVERT f1
536	REVERT f2n
537	}
538	fossil update trunk
539	fossil merge --integrate b
540	test_status_list merge_renames-13-9 $RESULT {
541	UPDATE f1
542	DELETE f2n
543	ADDED f2n
544	}
545	test_file_contents merge_renames-13-10 f2n "line1"
546
547	fossil revert
548	test_status_list merge_renames-13-11 $RESULT {
549	REVERT f1
550	REVERT f2n
551	}
552
553	######################################
554	#
555	# Tests for troubles not specifically linked with renames but that I'd like to
556
557	DDED test/merge_renames_2.test

	--- test/merge_renames.test
	+++ test/merge_renames.test
	@@ -523,33 +523,27 @@
523
524	fossil update m1
525	fossil merge b
526	test_status_list merge_renames-13-6 $RESULT {
527	UPDATE f1


528	}
529	test_file_contents merge_renames-13-7 f2n "line1"
530
531	fossil revert
532	test_status_list merge_renames-13-8 $RESULT {
533	REVERT f1

534	}
535	fossil update trunk
536	fossil merge --integrate b
537	test_status_list merge_renames-13-9 $RESULT {
538	UPDATE f1


539	}
540	test_file_contents merge_renames-13-10 f2n "line1"
541
542	fossil revert
543	test_status_list merge_renames-13-11 $RESULT {
544	REVERT f1

545	}
546
547	######################################
548	#
549	# Tests for troubles not specifically linked with renames but that I'd like to
550
551	DDED test/merge_renames_2.test

M test/merge_renames_2.test

+59

		--- a/test/merge_renames_2.test
		+++ b/test/merge_renames_2.test
		@@ -0,0 +1,59 @@
	1	+#
	2	+# Tests for merging with renames
	3	+#
	4	+#
	5	+
	6	+proc commit_id {version} {
	7	+ regexp -line {^artifact:\s+(\S+)} [fossil whatis $version] - id
	8	+ return $id
	9	+}
	10	+
	11	+require_no_open_checkout
	12	+
	13	+#################################################################
	14	+# Test 1 #
	15	+# https://fossil-scm.org/forum/forumpost/549700437b #
	16	+#################################################################
	17	+
	18	+test_setup
	19	+
	20	+write_file file1 "file1\n"
	21	+fossil add file1
	22	+fossil commit -m "added file1"
	23	+
	24	+write_file file2 "file2\n"
	25	+fossil add file2
	26	+fossil commit -m "added file2" --branch added
	27	+
	28	+write_file file2 "edit file2 on added\n"
	29	+fossil commit -m "edited file2"
	30	+
	31	+fossil mv --hard file2 file2.renamed
	32	+fossil commit -m "renamed file2" --branch renamed
	33	+
	34	+fossil branch new branched current
	35	+
	36	+write_file file2.renamed "edit file2.renamed on renamed\n"
	37	+fossil commit -m "edited file2.renamed"
	38	+
	39	+fossil update trunk
	40	+fossil merge renamed
	41	+fossil commit -m "merged from renamed"
	42	+
	43	+write_file file2.renamed "edit file2.renamed on trunk (1)\n"
	44	+fossil commit -m "edited file2.renamed on trunk (1)"
	45	+
	46	+fossil update branched
	47	+fossil merge trunk
	48	+test_status_list merge_renames_2-1.1 $RESULT {UPDATE file2.renamed}
	49	+fossil commit -m "merged edit from trunk (1:this merge succeeded)"
	50	+
	51	+fossil update trunk
	52	+write_file file2.renamed "edit2 file2.renamed on trunk (2)\n"
	53	+fossil commit -m "edited file2.renamed on trunk (2)"
	54	+
	55	+fossil update branched
	56	+fossil merge trunk
	57	+test_status_list merge_renames_2-1.2 $RESULT {UPDATE file2.renamed}
	58	+
	59	+test_cleanup

	--- a/test/merge_renames_2.test
	+++ b/test/merge_renames_2.test
	@@ -0,0 +1,59 @@

	--- a/test/merge_renames_2.test
	+++ b/test/merge_renames_2.test
	@@ -0,0 +1,59 @@
1	#
2	# Tests for merging with renames
3	#
4	#
5
6	proc commit_id {version} {
7	regexp -line {^artifact:\s+(\S+)} [fossil whatis $version] - id
8	return $id
9	}
10
11	require_no_open_checkout
12
13	#################################################################
14	# Test 1 #
15	# https://fossil-scm.org/forum/forumpost/549700437b #
16	#################################################################
17
18	test_setup
19
20	write_file file1 "file1\n"
21	fossil add file1
22	fossil commit -m "added file1"
23
24	write_file file2 "file2\n"
25	fossil add file2
26	fossil commit -m "added file2" --branch added
27
28	write_file file2 "edit file2 on added\n"
29	fossil commit -m "edited file2"
30
31	fossil mv --hard file2 file2.renamed
32	fossil commit -m "renamed file2" --branch renamed
33
34	fossil branch new branched current
35
36	write_file file2.renamed "edit file2.renamed on renamed\n"
37	fossil commit -m "edited file2.renamed"
38
39	fossil update trunk
40	fossil merge renamed
41	fossil commit -m "merged from renamed"
42
43	write_file file2.renamed "edit file2.renamed on trunk (1)\n"
44	fossil commit -m "edited file2.renamed on trunk (1)"
45
46	fossil update branched
47	fossil merge trunk
48	test_status_list merge_renames_2-1.1 $RESULT {UPDATE file2.renamed}
49	fossil commit -m "merged edit from trunk (1:this merge succeeded)"
50
51	fossil update trunk
52	write_file file2.renamed "edit2 file2.renamed on trunk (2)\n"
53	fossil commit -m "edited file2.renamed on trunk (2)"
54
55	fossil update branched
56	fossil merge trunk
57	test_status_list merge_renames_2-1.2 $RESULT {UPDATE file2.renamed}
58
59	test_cleanup

M win/Makefile.mingw

		--- win/Makefile.mingw
		+++ win/Makefile.mingw
		@@ -635,13 +635,15 @@
635	635	$(SRCDIR)/fossil.copybutton.js \
636	636	$(SRCDIR)/fossil.dom.js \
637	637	$(SRCDIR)/fossil.fetch.js \
638	638	$(SRCDIR)/fossil.info-diff.js \
639	639	$(SRCDIR)/fossil.numbered-lines.js \
	640	+ $(SRCDIR)/fossil.page.brlist.js \
640	641	$(SRCDIR)/fossil.page.fileedit.js \
641	642	$(SRCDIR)/fossil.page.forumpost.js \
642	643	$(SRCDIR)/fossil.page.pikchrshow.js \
	644	+ $(SRCDIR)/fossil.page.whistory.js \
643	645	$(SRCDIR)/fossil.page.wikiedit.js \
644	646	$(SRCDIR)/fossil.pikchr.js \
645	647	$(SRCDIR)/fossil.popupwidget.js \
646	648	$(SRCDIR)/fossil.storage.js \
647	649	$(SRCDIR)/fossil.tabs.js \
648	650

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -635,13 +635,15 @@
635	$(SRCDIR)/fossil.copybutton.js \
636	$(SRCDIR)/fossil.dom.js \
637	$(SRCDIR)/fossil.fetch.js \
638	$(SRCDIR)/fossil.info-diff.js \
639	$(SRCDIR)/fossil.numbered-lines.js \

640	$(SRCDIR)/fossil.page.fileedit.js \
641	$(SRCDIR)/fossil.page.forumpost.js \
642	$(SRCDIR)/fossil.page.pikchrshow.js \

643	$(SRCDIR)/fossil.page.wikiedit.js \
644	$(SRCDIR)/fossil.pikchr.js \
645	$(SRCDIR)/fossil.popupwidget.js \
646	$(SRCDIR)/fossil.storage.js \
647	$(SRCDIR)/fossil.tabs.js \
648

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -635,13 +635,15 @@
635	$(SRCDIR)/fossil.copybutton.js \
636	$(SRCDIR)/fossil.dom.js \
637	$(SRCDIR)/fossil.fetch.js \
638	$(SRCDIR)/fossil.info-diff.js \
639	$(SRCDIR)/fossil.numbered-lines.js \
640	$(SRCDIR)/fossil.page.brlist.js \
641	$(SRCDIR)/fossil.page.fileedit.js \
642	$(SRCDIR)/fossil.page.forumpost.js \
643	$(SRCDIR)/fossil.page.pikchrshow.js \
644	$(SRCDIR)/fossil.page.whistory.js \
645	$(SRCDIR)/fossil.page.wikiedit.js \
646	$(SRCDIR)/fossil.pikchr.js \
647	$(SRCDIR)/fossil.popupwidget.js \
648	$(SRCDIR)/fossil.storage.js \
649	$(SRCDIR)/fossil.tabs.js \
650

M win/Makefile.msc

		--- win/Makefile.msc
		+++ win/Makefile.msc
		@@ -577,13 +577,15 @@
577	577	"$(SRCDIR)\fossil.copybutton.js" \
578	578	"$(SRCDIR)\fossil.dom.js" \
579	579	"$(SRCDIR)\fossil.fetch.js" \
580	580	"$(SRCDIR)\fossil.info-diff.js" \
581	581	"$(SRCDIR)\fossil.numbered-lines.js" \
	582	+ "$(SRCDIR)\fossil.page.brlist.js" \
582	583	"$(SRCDIR)\fossil.page.fileedit.js" \
583	584	"$(SRCDIR)\fossil.page.forumpost.js" \
584	585	"$(SRCDIR)\fossil.page.pikchrshow.js" \
	586	+ "$(SRCDIR)\fossil.page.whistory.js" \
585	587	"$(SRCDIR)\fossil.page.wikiedit.js" \
586	588	"$(SRCDIR)\fossil.pikchr.js" \
587	589	"$(SRCDIR)\fossil.popupwidget.js" \
588	590	"$(SRCDIR)\fossil.storage.js" \
589	591	"$(SRCDIR)\fossil.tabs.js" \
		@@ -1181,13 +1183,15 @@
1181	1183	echo "$(SRCDIR)\fossil.copybutton.js" >> $@
1182	1184	echo "$(SRCDIR)\fossil.dom.js" >> $@
1183	1185	echo "$(SRCDIR)\fossil.fetch.js" >> $@
1184	1186	echo "$(SRCDIR)\fossil.info-diff.js" >> $@
1185	1187	echo "$(SRCDIR)\fossil.numbered-lines.js" >> $@
	1188	+ echo "$(SRCDIR)\fossil.page.brlist.js" >> $@
1186	1189	echo "$(SRCDIR)\fossil.page.fileedit.js" >> $@
1187	1190	echo "$(SRCDIR)\fossil.page.forumpost.js" >> $@
1188	1191	echo "$(SRCDIR)\fossil.page.pikchrshow.js" >> $@
	1192	+ echo "$(SRCDIR)\fossil.page.whistory.js" >> $@
1189	1193	echo "$(SRCDIR)\fossil.page.wikiedit.js" >> $@
1190	1194	echo "$(SRCDIR)\fossil.pikchr.js" >> $@
1191	1195	echo "$(SRCDIR)\fossil.popupwidget.js" >> $@
1192	1196	echo "$(SRCDIR)\fossil.storage.js" >> $@
1193	1197	echo "$(SRCDIR)\fossil.tabs.js" >> $@
1194	1198

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -577,13 +577,15 @@
577	"$(SRCDIR)\fossil.copybutton.js" \
578	"$(SRCDIR)\fossil.dom.js" \
579	"$(SRCDIR)\fossil.fetch.js" \
580	"$(SRCDIR)\fossil.info-diff.js" \
581	"$(SRCDIR)\fossil.numbered-lines.js" \

582	"$(SRCDIR)\fossil.page.fileedit.js" \
583	"$(SRCDIR)\fossil.page.forumpost.js" \
584	"$(SRCDIR)\fossil.page.pikchrshow.js" \

585	"$(SRCDIR)\fossil.page.wikiedit.js" \
586	"$(SRCDIR)\fossil.pikchr.js" \
587	"$(SRCDIR)\fossil.popupwidget.js" \
588	"$(SRCDIR)\fossil.storage.js" \
589	"$(SRCDIR)\fossil.tabs.js" \
	@@ -1181,13 +1183,15 @@
1181	echo "$(SRCDIR)\fossil.copybutton.js" >> $@
1182	echo "$(SRCDIR)\fossil.dom.js" >> $@
1183	echo "$(SRCDIR)\fossil.fetch.js" >> $@
1184	echo "$(SRCDIR)\fossil.info-diff.js" >> $@
1185	echo "$(SRCDIR)\fossil.numbered-lines.js" >> $@

1186	echo "$(SRCDIR)\fossil.page.fileedit.js" >> $@
1187	echo "$(SRCDIR)\fossil.page.forumpost.js" >> $@
1188	echo "$(SRCDIR)\fossil.page.pikchrshow.js" >> $@

1189	echo "$(SRCDIR)\fossil.page.wikiedit.js" >> $@
1190	echo "$(SRCDIR)\fossil.pikchr.js" >> $@
1191	echo "$(SRCDIR)\fossil.popupwidget.js" >> $@
1192	echo "$(SRCDIR)\fossil.storage.js" >> $@
1193	echo "$(SRCDIR)\fossil.tabs.js" >> $@
1194

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -577,13 +577,15 @@
577	"$(SRCDIR)\fossil.copybutton.js" \
578	"$(SRCDIR)\fossil.dom.js" \
579	"$(SRCDIR)\fossil.fetch.js" \
580	"$(SRCDIR)\fossil.info-diff.js" \
581	"$(SRCDIR)\fossil.numbered-lines.js" \
582	"$(SRCDIR)\fossil.page.brlist.js" \
583	"$(SRCDIR)\fossil.page.fileedit.js" \
584	"$(SRCDIR)\fossil.page.forumpost.js" \
585	"$(SRCDIR)\fossil.page.pikchrshow.js" \
586	"$(SRCDIR)\fossil.page.whistory.js" \
587	"$(SRCDIR)\fossil.page.wikiedit.js" \
588	"$(SRCDIR)\fossil.pikchr.js" \
589	"$(SRCDIR)\fossil.popupwidget.js" \
590	"$(SRCDIR)\fossil.storage.js" \
591	"$(SRCDIR)\fossil.tabs.js" \
	@@ -1181,13 +1183,15 @@
1183	echo "$(SRCDIR)\fossil.copybutton.js" >> $@
1184	echo "$(SRCDIR)\fossil.dom.js" >> $@
1185	echo "$(SRCDIR)\fossil.fetch.js" >> $@
1186	echo "$(SRCDIR)\fossil.info-diff.js" >> $@
1187	echo "$(SRCDIR)\fossil.numbered-lines.js" >> $@
1188	echo "$(SRCDIR)\fossil.page.brlist.js" >> $@
1189	echo "$(SRCDIR)\fossil.page.fileedit.js" >> $@
1190	echo "$(SRCDIR)\fossil.page.forumpost.js" >> $@
1191	echo "$(SRCDIR)\fossil.page.pikchrshow.js" >> $@
1192	echo "$(SRCDIR)\fossil.page.whistory.js" >> $@
1193	echo "$(SRCDIR)\fossil.page.wikiedit.js" >> $@
1194	echo "$(SRCDIR)\fossil.pikchr.js" >> $@
1195	echo "$(SRCDIR)\fossil.popupwidget.js" >> $@
1196	echo "$(SRCDIR)\fossil.storage.js" >> $@
1197	echo "$(SRCDIR)\fossil.tabs.js" >> $@
1198

Fossil SCM

Keyboard Shortcuts