Fossil SCM

Merge trunk

jan.nijtmans 2015-06-05 10:28 exec-rel-paths merge

Commit d066ee039fc6e405e96d8a4392144b5cc78be448

Parent 3ffb6a3e6299e92…

3 files changed +1 -1 +2 +19 -17

~ src/merge.c ~ src/th_lang.c ~ www/hints.wiki

M src/merge.c

+1 -1

		--- src/merge.c
		+++ src/merge.c
		@@ -657,11 +657,11 @@
657	657	}
658	658	db_finalize(&q);
659	659
660	660	/*
661	661	** Rename files that have taken a rename on P->M but which keep the same
662		- ** name o P->V. If a file is renamed on P->V only or on both P->V and
	662	+ ** name on P->V. If a file is renamed on P->V only or on both P->V and
663	663	** P->M then we retain the V name of the file.
664	664	*/
665	665	db_prepare(&q,
666	666	"SELECT idv, fnp, fnm FROM fv"
667	667	" WHERE idv>0 AND idp>0 AND idm>0 AND fnp=fn AND fnm!=fnp"
668	668

	--- src/merge.c
	+++ src/merge.c
	@@ -657,11 +657,11 @@
657	}
658	db_finalize(&q);
659
660	/*
661	** Rename files that have taken a rename on P->M but which keep the same
662	** name o P->V. If a file is renamed on P->V only or on both P->V and
663	** P->M then we retain the V name of the file.
664	*/
665	db_prepare(&q,
666	"SELECT idv, fnp, fnm FROM fv"
667	" WHERE idv>0 AND idp>0 AND idm>0 AND fnp=fn AND fnm!=fnp"
668

	--- src/merge.c
	+++ src/merge.c
	@@ -657,11 +657,11 @@
657	}
658	db_finalize(&q);
659
660	/*
661	** Rename files that have taken a rename on P->M but which keep the same
662	** name on P->V. If a file is renamed on P->V only or on both P->V and
663	** P->M then we retain the V name of the file.
664	*/
665	db_prepare(&q,
666	"SELECT idv, fnp, fnm FROM fv"
667	" WHERE idv>0 AND idp>0 AND idm>0 AND fnp=fn AND fnm!=fnp"
668

M src/th_lang.c

		--- src/th_lang.c
		+++ src/th_lang.c
		@@ -920,10 +920,11 @@
920	920	rc = Th_ListAppendCommands(interp, &zElem, &nElem);
921	921	if( rc!=TH_OK ){
922	922	return rc;
923	923	}
924	924	Th_SetResult(interp, zElem, nElem);
	925	+ if( zElem ) Th_Free(interp, zElem);
925	926	return TH_OK;
926	927	}
927	928
928	929	/*
929	930	** TH Syntax:
		@@ -943,10 +944,11 @@
943	944	rc = Th_ListAppendVariables(interp, &zElem, &nElem);
944	945	if( rc!=TH_OK ){
945	946	return rc;
946	947	}
947	948	Th_SetResult(interp, zElem, nElem);
	949	+ if( zElem ) Th_Free(interp, zElem);
948	950	return TH_OK;
949	951	}
950	952
951	953	/*
952	954	** TH Syntax:
953	955

	--- src/th_lang.c
	+++ src/th_lang.c
	@@ -920,10 +920,11 @@
920	rc = Th_ListAppendCommands(interp, &zElem, &nElem);
921	if( rc!=TH_OK ){
922	return rc;
923	}
924	Th_SetResult(interp, zElem, nElem);

925	return TH_OK;
926	}
927
928	/*
929	** TH Syntax:
	@@ -943,10 +944,11 @@
943	rc = Th_ListAppendVariables(interp, &zElem, &nElem);
944	if( rc!=TH_OK ){
945	return rc;
946	}
947	Th_SetResult(interp, zElem, nElem);

948	return TH_OK;
949	}
950
951	/*
952	** TH Syntax:
953

	--- src/th_lang.c
	+++ src/th_lang.c
	@@ -920,10 +920,11 @@
920	rc = Th_ListAppendCommands(interp, &zElem, &nElem);
921	if( rc!=TH_OK ){
922	return rc;
923	}
924	Th_SetResult(interp, zElem, nElem);
925	if( zElem ) Th_Free(interp, zElem);
926	return TH_OK;
927	}
928
929	/*
930	** TH Syntax:
	@@ -943,10 +944,11 @@
944	rc = Th_ListAppendVariables(interp, &zElem, &nElem);
945	if( rc!=TH_OK ){
946	return rc;
947	}
948	Th_SetResult(interp, zElem, nElem);
949	if( zElem ) Th_Free(interp, zElem);
950	return TH_OK;
951	}
952
953	/*
954	** TH Syntax:
955

M www/hints.wiki

+19 -17

		--- www/hints.wiki
		+++ www/hints.wiki
		@@ -1,49 +1,51 @@
1	1	<title>Fossil Tips And Usage Hints</title>
2	2
3	3	1. Click on nodes of any timeline graph to see diffs between the two
4	4	selected versions.
5	5
6		- 2. Add the "--tk" option to "[/help?cmd=diff \| fossil diff]" commands
	6	+ 2. Add the "--tk" option to "[/help?cmd=diff \| fossil diff]" commands
7	7	to get a pop-up
8	8	window containing a complete side-by-side diff. (NB: The pop-up
9		- window is run as a separate Tcl/Tk process, so you will need to
	9	+ window is run as a separate Tcl/Tk process, so you will need to
10	10	have Tcl/Tk installed on your machine for this to work. Visit
11	11	[http://www.activestate.com/activetcl] to for a quick download of
12	12	Tcl/Tk if you do not already have it on your system.)
13	13
14		- 3. The "[/help/clean \| fossil clean -f]" or
15		- "[/help/clean \| fossil clean --verily]" command is a great
16		- alternative to "make clean".
17		-
18		- 4. Use "[/help?cmd=all \| fossil all changes]" to look for any uncommitted
19		- edits in any of your Fossil projects. Use
	14	+ 3. The "[/help/clean \| fossil clean -x]" command is a great
	15	+ alternative to "make clean". You can use "[/help/clean \| fossil clean -f]"
	16	+ as a slightly safer alternative if the "ignore-glob" setting is
	17	+ not set. WARNING: make sure you did a "fossil add" for all source-files
	18	+ you plan to commit, otherwise those files will be deleted without warning.
	19	+
	20	+ 4. Use "[/help?cmd=all \| fossil all changes]" to look for any uncommitted
	21	+ edits in any of your Fossil projects. Use
20	22	"[/help?cmd=all \| fossil all pull]" on your laptop
21	23	prior to going off network (for example, on a long plane ride)
22	24	to make sure you have all the latest content locally. Then run
23	25	"[/help/all\|fossil all push]" when you get back online to upload
24	26	your changes.
25		-
	27	+
26	28	5. To see an entire timeline, type "all" into the "Max:" entry box.
27		-
	29	+
28	30	6. You can manually add a "c=CHECKIN" query parameter to the timeline
29	31	URL to get a snapshot of what was going on about the time of some
30	32	check-in. The "CHECKIN" can be
31	33	[./checkin_names.wiki \| any valid check-in or version name], including
32		- tags, branch names, and dates. For example, to see what was going
	34	+ tags, branch names, and dates. For example, to see what was going
33	35	on in the Fossil repository on 2008-01-01, visit
34	36	[http://www.fossil-scm.org/fossil/timeline?c=2008-01-01].
35		-
	37	+
36	38	7. Further to the previous two hints, there are lots of query parameters
37	39	that you can add to timeline pages. The available query parameters
38	40	are tersely documented [/help?cmd=/timeline \| here].
39		-
	41	+
40	42	8. You can run "[/help?cmd=test-diff \| fossil test-diff --tk $file1 $file2]"
41		- to get a pop-up window with side-by-side diffs of two files, even if
42		- neither of the two files is part of any Fossil repository. Note that
	43	+ to get a pop-up window with side-by-side diffs of two files, even if
	44	+ neither of the two files is part of any Fossil repository. Note that
43	45	this command is "test-diff", not "diff".
44		-
	46	+
45	47	9. On web pages showing the content of a file (for example
46	48	[http://www.fossil-scm.org/fossil/artifact/c7dd1de9f]) you can manually
47	49	add a query parameter of the form "ln=FROM,TO" to the URL that
48	50	will cause the range of lines indicated to be highlighted. This
49	51	is useful in pointing out a few lines of code using a hyperlink
		@@ -50,10 +52,10 @@
50	52	in an email or text message. Example:
51	53	[http://www.fossil-scm.org/fossil/artifact/c7dd1de9f?ln=28,30].
52	54	Adding the "ln" query parameter without any argument simply turns
53	55	on line numbers. This feature only works right with files with
54	56	a mimetype of text/plain, of course.
55		-
	57	+
56	58	10. When editing documentation to be checked in as managed files, you can
57	59	preview what the documentation will look like by using the special
58	60	"ckout" branch name in the "doc" URL while running "fossil ui".
59	61	See the [./embeddeddoc.wiki \| embedded documentation] for details.
60	62

	--- www/hints.wiki
	+++ www/hints.wiki
	@@ -1,49 +1,51 @@
1	<title>Fossil Tips And Usage Hints</title>
2
3	1. Click on nodes of any timeline graph to see diffs between the two
4	selected versions.
5
6	2. Add the "--tk" option to "[/help?cmd=diff \| fossil diff]" commands
7	to get a pop-up
8	window containing a complete side-by-side diff. (NB: The pop-up
9	window is run as a separate Tcl/Tk process, so you will need to
10	have Tcl/Tk installed on your machine for this to work. Visit
11	[http://www.activestate.com/activetcl] to for a quick download of
12	Tcl/Tk if you do not already have it on your system.)
13
14	3. The "[/help/clean \| fossil clean -f]" or
15	"[/help/clean \| fossil clean --verily]" command is a great
16	alternative to "make clean".
17
18	4. Use "[/help?cmd=all \| fossil all changes]" to look for any uncommitted
19	edits in any of your Fossil projects. Use


20	"[/help?cmd=all \| fossil all pull]" on your laptop
21	prior to going off network (for example, on a long plane ride)
22	to make sure you have all the latest content locally. Then run
23	"[/help/all\|fossil all push]" when you get back online to upload
24	your changes.
25
26	5. To see an entire timeline, type "all" into the "Max:" entry box.
27
28	6. You can manually add a "c=CHECKIN" query parameter to the timeline
29	URL to get a snapshot of what was going on about the time of some
30	check-in. The "CHECKIN" can be
31	[./checkin_names.wiki \| any valid check-in or version name], including
32	tags, branch names, and dates. For example, to see what was going
33	on in the Fossil repository on 2008-01-01, visit
34	[http://www.fossil-scm.org/fossil/timeline?c=2008-01-01].
35
36	7. Further to the previous two hints, there are lots of query parameters
37	that you can add to timeline pages. The available query parameters
38	are tersely documented [/help?cmd=/timeline \| here].
39
40	8. You can run "[/help?cmd=test-diff \| fossil test-diff --tk $file1 $file2]"
41	to get a pop-up window with side-by-side diffs of two files, even if
42	neither of the two files is part of any Fossil repository. Note that
43	this command is "test-diff", not "diff".
44
45	9. On web pages showing the content of a file (for example
46	[http://www.fossil-scm.org/fossil/artifact/c7dd1de9f]) you can manually
47	add a query parameter of the form "ln=FROM,TO" to the URL that
48	will cause the range of lines indicated to be highlighted. This
49	is useful in pointing out a few lines of code using a hyperlink
	@@ -50,10 +52,10 @@
50	in an email or text message. Example:
51	[http://www.fossil-scm.org/fossil/artifact/c7dd1de9f?ln=28,30].
52	Adding the "ln" query parameter without any argument simply turns
53	on line numbers. This feature only works right with files with
54	a mimetype of text/plain, of course.
55
56	10. When editing documentation to be checked in as managed files, you can
57	preview what the documentation will look like by using the special
58	"ckout" branch name in the "doc" URL while running "fossil ui".
59	See the [./embeddeddoc.wiki \| embedded documentation] for details.
60

	--- www/hints.wiki
	+++ www/hints.wiki
	@@ -1,49 +1,51 @@
1	<title>Fossil Tips And Usage Hints</title>
2
3	1. Click on nodes of any timeline graph to see diffs between the two
4	selected versions.
5
6	2. Add the "--tk" option to "[/help?cmd=diff \| fossil diff]" commands
7	to get a pop-up
8	window containing a complete side-by-side diff. (NB: The pop-up
9	window is run as a separate Tcl/Tk process, so you will need to
10	have Tcl/Tk installed on your machine for this to work. Visit
11	[http://www.activestate.com/activetcl] to for a quick download of
12	Tcl/Tk if you do not already have it on your system.)
13
14	3. The "[/help/clean \| fossil clean -x]" command is a great
15	alternative to "make clean". You can use "[/help/clean \| fossil clean -f]"
16	as a slightly safer alternative if the "ignore-glob" setting is
17	not set. WARNING: make sure you did a "fossil add" for all source-files
18	you plan to commit, otherwise those files will be deleted without warning.
19
20	4. Use "[/help?cmd=all \| fossil all changes]" to look for any uncommitted
21	edits in any of your Fossil projects. Use
22	"[/help?cmd=all \| fossil all pull]" on your laptop
23	prior to going off network (for example, on a long plane ride)
24	to make sure you have all the latest content locally. Then run
25	"[/help/all\|fossil all push]" when you get back online to upload
26	your changes.
27
28	5. To see an entire timeline, type "all" into the "Max:" entry box.
29
30	6. You can manually add a "c=CHECKIN" query parameter to the timeline
31	URL to get a snapshot of what was going on about the time of some
32	check-in. The "CHECKIN" can be
33	[./checkin_names.wiki \| any valid check-in or version name], including
34	tags, branch names, and dates. For example, to see what was going
35	on in the Fossil repository on 2008-01-01, visit
36	[http://www.fossil-scm.org/fossil/timeline?c=2008-01-01].
37
38	7. Further to the previous two hints, there are lots of query parameters
39	that you can add to timeline pages. The available query parameters
40	are tersely documented [/help?cmd=/timeline \| here].
41
42	8. You can run "[/help?cmd=test-diff \| fossil test-diff --tk $file1 $file2]"
43	to get a pop-up window with side-by-side diffs of two files, even if
44	neither of the two files is part of any Fossil repository. Note that
45	this command is "test-diff", not "diff".
46
47	9. On web pages showing the content of a file (for example
48	[http://www.fossil-scm.org/fossil/artifact/c7dd1de9f]) you can manually
49	add a query parameter of the form "ln=FROM,TO" to the URL that
50	will cause the range of lines indicated to be highlighted. This
51	is useful in pointing out a few lines of code using a hyperlink
	@@ -50,10 +52,10 @@
52	in an email or text message. Example:
53	[http://www.fossil-scm.org/fossil/artifact/c7dd1de9f?ln=28,30].
54	Adding the "ln" query parameter without any argument simply turns
55	on line numbers. This feature only works right with files with
56	a mimetype of text/plain, of course.
57
58	10. When editing documentation to be checked in as managed files, you can
59	preview what the documentation will look like by using the special
60	"ckout" branch name in the "doc" URL while running "fossil ui".
61	See the [./embeddeddoc.wiki \| embedded documentation] for details.
62

Fossil SCM

Keyboard Shortcuts