Fossil SCM

Make new "merge --integrate" respect the (undocumented) --date-override and --user-override options. Revert accidental commit of win/Makefile.mingw

jan.nijtmans 2013-08-01 08:25 UTC trunk

Commit 55efbcbcf6864549e4b8bb66b1564885ec135e5b

Parent 69dd259eb27d207…

2 files changed +4 -4 +2 -2

M src/checkin.c

+4 -4

		--- src/checkin.c
		+++ src/checkin.c
		@@ -1702,18 +1702,18 @@
1702	1702	" WHERE tagid=%d AND rid=%d AND tagtype>0",
1703	1703	TAG_CLOSED, rid)
1704	1704	){
1705	1705	Blob ctrl;
1706	1706	Blob cksum;
1707		- char *zNow;
	1707	+ char *zDate;
1708	1708	int nrid;
1709	1709
1710	1710	blob_zero(&ctrl);
1711		- zNow = date_in_standard_format("now");
1712		- blob_appendf(&ctrl, "D %s\n", zNow);
	1711	+ zDate = date_in_standard_format(sCiInfo.zDateOvrd ? sCiInfo.zDateOvrd : "now");
	1712	+ blob_appendf(&ctrl, "D %s\n", zDate);
1713	1713	blob_appendf(&ctrl, "T +closed %s\n", zIntegrateUuid);
1714		- blob_appendf(&ctrl, "U %F\n", g.zLogin);
	1714	+ blob_appendf(&ctrl, "U %F\n", sCiInfo.zUserOvrd ? sCiInfo.zUserOvrd : g.zLogin);
1715	1715	md5sum_blob(&ctrl, &cksum);
1716	1716	blob_appendf(&ctrl, "Z %b\n", &cksum);
1717	1717	nrid = content_put(&ctrl);
1718	1718	manifest_crosslink(nrid, &ctrl);
1719	1719	assert( blob_is_reset(&ctrl) );
1720	1720

	--- src/checkin.c
	+++ src/checkin.c
	@@ -1702,18 +1702,18 @@
1702	" WHERE tagid=%d AND rid=%d AND tagtype>0",
1703	TAG_CLOSED, rid)
1704	){
1705	Blob ctrl;
1706	Blob cksum;
1707	char *zNow;
1708	int nrid;
1709
1710	blob_zero(&ctrl);
1711	zNow = date_in_standard_format("now");
1712	blob_appendf(&ctrl, "D %s\n", zNow);
1713	blob_appendf(&ctrl, "T +closed %s\n", zIntegrateUuid);
1714	blob_appendf(&ctrl, "U %F\n", g.zLogin);
1715	md5sum_blob(&ctrl, &cksum);
1716	blob_appendf(&ctrl, "Z %b\n", &cksum);
1717	nrid = content_put(&ctrl);
1718	manifest_crosslink(nrid, &ctrl);
1719	assert( blob_is_reset(&ctrl) );
1720

	--- src/checkin.c
	+++ src/checkin.c
	@@ -1702,18 +1702,18 @@
1702	" WHERE tagid=%d AND rid=%d AND tagtype>0",
1703	TAG_CLOSED, rid)
1704	){
1705	Blob ctrl;
1706	Blob cksum;
1707	char *zDate;
1708	int nrid;
1709
1710	blob_zero(&ctrl);
1711	zDate = date_in_standard_format(sCiInfo.zDateOvrd ? sCiInfo.zDateOvrd : "now");
1712	blob_appendf(&ctrl, "D %s\n", zDate);
1713	blob_appendf(&ctrl, "T +closed %s\n", zIntegrateUuid);
1714	blob_appendf(&ctrl, "U %F\n", sCiInfo.zUserOvrd ? sCiInfo.zUserOvrd : g.zLogin);
1715	md5sum_blob(&ctrl, &cksum);
1716	blob_appendf(&ctrl, "Z %b\n", &cksum);
1717	nrid = content_put(&ctrl);
1718	manifest_crosslink(nrid, &ctrl);
1719	assert( blob_is_reset(&ctrl) );
1720

M win/Makefile.mingw

+2 -2

		--- win/Makefile.mingw
		+++ win/Makefile.mingw
		@@ -13,15 +13,15 @@
13	13	#
14	14
15	15	#### Select one of MinGW, MinGW-w64 (32-bit) or MinGW-w64 (64-bit) compilers.
16	16	# By default, this is an empty string (i.e. use the native compiler).
17	17	#
18		-# PREFIX =
	18	+PREFIX =
19	19	# PREFIX = mingw32-
20	20	# PREFIX = i686-pc-mingw32-
21	21	# PREFIX = i686-w64-mingw32-
22		-PREFIX = x86_64-w64-mingw32-
	22	+# PREFIX = x86_64-w64-mingw32-
23	23
24	24	#### The toplevel directory of the source tree. Fossil can be built
25	25	# in a directory that is separate from the source tree. Just change
26	26	# the following to point from the build directory to the src/ folder.
27	27	#
28	28

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -13,15 +13,15 @@
13	#
14
15	#### Select one of MinGW, MinGW-w64 (32-bit) or MinGW-w64 (64-bit) compilers.
16	# By default, this is an empty string (i.e. use the native compiler).
17	#
18	# PREFIX =
19	# PREFIX = mingw32-
20	# PREFIX = i686-pc-mingw32-
21	# PREFIX = i686-w64-mingw32-
22	PREFIX = x86_64-w64-mingw32-
23
24	#### The toplevel directory of the source tree. Fossil can be built
25	# in a directory that is separate from the source tree. Just change
26	# the following to point from the build directory to the src/ folder.
27	#
28

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -13,15 +13,15 @@
13	#
14
15	#### Select one of MinGW, MinGW-w64 (32-bit) or MinGW-w64 (64-bit) compilers.
16	# By default, this is an empty string (i.e. use the native compiler).
17	#
18	PREFIX =
19	# PREFIX = mingw32-
20	# PREFIX = i686-pc-mingw32-
21	# PREFIX = i686-w64-mingw32-
22	# PREFIX = x86_64-w64-mingw32-
23
24	#### The toplevel directory of the source tree. Fossil can be built
25	# in a directory that is separate from the source tree. Just change
26	# the following to point from the build directory to the src/ folder.
27	#
28