Fossil SCM

Merge latest from trunk

brickviking 2024-12-06 06:13 bv-infotool merge

Commit f040c11f3293cd154baa992947c360e7e105a4e78c4d3c82b5b8b38a21fd3eff

Parent f826331554a8848…

1 file changed +4 -4

M src/merge.c

+4 -4

		--- src/merge.c
		+++ src/merge.c
		@@ -240,11 +240,11 @@
240	240	** Usage: %fossil merge-info [OPTIONS]
241	241	**
242	242	** Display information about the most recent merge operation.
243	243	**
244	244	** Options:
245		-** -a\|--all Show all all file changes that happened because of
	245	+** -a\|--all Show all file changes that happened because of
246	246	** the merge. Normally only MERGE, CONFLICT, and ERROR
247	247	** lines are shown
248	248	** -c\|--context N Show N lines of context around each change,
249	249	** with negative N meaning show all content. Only
250	250	** meaningful in combination with --tcl or --tk.
		@@ -253,11 +253,11 @@
253	253	** information needed to display the changes to
254	254	** FILE caused by the most recent merge. FILE must
255	255	** be a pathname relative to the root of the check-out.
256	256	** --tk Bring up a Tcl/Tk GUI that shows the changes
257	257	** associated with the most recent merge.
258		-**
	258	+**
259	259	*/
260	260	void merge_info_cmd(void){
261	261	const char *zCnt;
262	262	const char *zTcl;
263	263	int bTk;
		@@ -1207,11 +1207,11 @@
1207	1207	** of M and V is an empty file. In this case, merge conflict marks will be
1208	1208	** added to the file and user will be forced to take a decision.
1209	1209	*/
1210	1210	db_prepare(&q,
1211	1211	/* 0 1 2 3 4 5 6 7 8 */
1212		- "SELECT ridm, idv, ridp, ridv, %s, fn, isexe, islinkv, islinkm,"
	1212	+ "SELECT ridm, idv, ridp, ridv, %z, fn, isexe, islinkv, islinkm,"
1213	1213	/* 9 10 11 */
1214	1214	" fnp, fnm, chnged"
1215	1215	" FROM fv"
1216	1216	" WHERE idv>0 AND idm>0"
1217	1217	" AND ridm!=ridp AND (ridv!=ridp OR chnged)",
		@@ -1292,11 +1292,11 @@
1292	1292	zErrMsg = "cannot merge binary file";
1293	1293	zType = "ERROR";
1294	1294	}
1295	1295	db_multi_exec(
1296	1296	"INSERT INTO mergestat(op,fnp,ridp,fn,ridv,sz,fnm,ridm,fnr,nc,msg)"
1297		- "VALUES(%Q,%Q,%d,%Q,iif(%d,%d,NULL),iif(%d,%d,NULL),%Q,%d,"
	1297	+ "VALUES(%Q,%Q,%d,%Q,iif(%d,%d,NULL),iif(%d,%lld,NULL),%Q,%d,"
1298	1298	"%Q,%d,%Q)",
1299	1299	/* op */ zType,
1300	1300	/* fnp */ db_column_text(&q, 9),
1301	1301	/* ridp */ ridp,
1302	1302	/* fn */ zName,
1303	1303

	--- src/merge.c
	+++ src/merge.c
	@@ -240,11 +240,11 @@
240	** Usage: %fossil merge-info [OPTIONS]
241	**
242	** Display information about the most recent merge operation.
243	**
244	** Options:
245	** -a\|--all Show all all file changes that happened because of
246	** the merge. Normally only MERGE, CONFLICT, and ERROR
247	** lines are shown
248	** -c\|--context N Show N lines of context around each change,
249	** with negative N meaning show all content. Only
250	** meaningful in combination with --tcl or --tk.
	@@ -253,11 +253,11 @@
253	** information needed to display the changes to
254	** FILE caused by the most recent merge. FILE must
255	** be a pathname relative to the root of the check-out.
256	** --tk Bring up a Tcl/Tk GUI that shows the changes
257	** associated with the most recent merge.
258	**
259	*/
260	void merge_info_cmd(void){
261	const char *zCnt;
262	const char *zTcl;
263	int bTk;
	@@ -1207,11 +1207,11 @@
1207	** of M and V is an empty file. In this case, merge conflict marks will be
1208	** added to the file and user will be forced to take a decision.
1209	*/
1210	db_prepare(&q,
1211	/* 0 1 2 3 4 5 6 7 8 */
1212	"SELECT ridm, idv, ridp, ridv, %s, fn, isexe, islinkv, islinkm,"
1213	/* 9 10 11 */
1214	" fnp, fnm, chnged"
1215	" FROM fv"
1216	" WHERE idv>0 AND idm>0"
1217	" AND ridm!=ridp AND (ridv!=ridp OR chnged)",
	@@ -1292,11 +1292,11 @@
1292	zErrMsg = "cannot merge binary file";
1293	zType = "ERROR";
1294	}
1295	db_multi_exec(
1296	"INSERT INTO mergestat(op,fnp,ridp,fn,ridv,sz,fnm,ridm,fnr,nc,msg)"
1297	"VALUES(%Q,%Q,%d,%Q,iif(%d,%d,NULL),iif(%d,%d,NULL),%Q,%d,"
1298	"%Q,%d,%Q)",
1299	/* op */ zType,
1300	/* fnp */ db_column_text(&q, 9),
1301	/* ridp */ ridp,
1302	/* fn */ zName,
1303

	--- src/merge.c
	+++ src/merge.c
	@@ -240,11 +240,11 @@
240	** Usage: %fossil merge-info [OPTIONS]
241	**
242	** Display information about the most recent merge operation.
243	**
244	** Options:
245	** -a\|--all Show all file changes that happened because of
246	** the merge. Normally only MERGE, CONFLICT, and ERROR
247	** lines are shown
248	** -c\|--context N Show N lines of context around each change,
249	** with negative N meaning show all content. Only
250	** meaningful in combination with --tcl or --tk.
	@@ -253,11 +253,11 @@
253	** information needed to display the changes to
254	** FILE caused by the most recent merge. FILE must
255	** be a pathname relative to the root of the check-out.
256	** --tk Bring up a Tcl/Tk GUI that shows the changes
257	** associated with the most recent merge.
258	**
259	*/
260	void merge_info_cmd(void){
261	const char *zCnt;
262	const char *zTcl;
263	int bTk;
	@@ -1207,11 +1207,11 @@
1207	** of M and V is an empty file. In this case, merge conflict marks will be
1208	** added to the file and user will be forced to take a decision.
1209	*/
1210	db_prepare(&q,
1211	/* 0 1 2 3 4 5 6 7 8 */
1212	"SELECT ridm, idv, ridp, ridv, %z, fn, isexe, islinkv, islinkm,"
1213	/* 9 10 11 */
1214	" fnp, fnm, chnged"
1215	" FROM fv"
1216	" WHERE idv>0 AND idm>0"
1217	" AND ridm!=ridp AND (ridv!=ridp OR chnged)",
	@@ -1292,11 +1292,11 @@
1292	zErrMsg = "cannot merge binary file";
1293	zType = "ERROR";
1294	}
1295	db_multi_exec(
1296	"INSERT INTO mergestat(op,fnp,ridp,fn,ridv,sz,fnm,ridm,fnr,nc,msg)"
1297	"VALUES(%Q,%Q,%d,%Q,iif(%d,%d,NULL),iif(%d,%lld,NULL),%Q,%d,"
1298	"%Q,%d,%Q)",
1299	/* op */ zType,
1300	/* fnp */ db_column_text(&q, 9),
1301	/* ridp */ ridp,
1302	/* fn */ zName,
1303

Fossil SCM

Keyboard Shortcuts