Fossil SCM

Fix over-length source code lines in merge.c.

drh 2018-05-31 14:32 trunk

Commit 5a88b5f6637199f8e9c3b1e4ef5084d67414748d123d66e5bfac893f29a6c05d

Parent 3c5ba9f5e8b3494…

1 file changed +7 -4

M src/merge.c

+7 -4

		--- src/merge.c
		+++ src/merge.c
		@@ -287,11 +287,12 @@
287	287	** the leaf is not closed and (4) the leaf is in the same branch
288	288	** as the current checkout.
289	289	*/
290	290	Stmt q;
291	291	if( pickFlag \|\| backoutFlag \|\| integrateFlag){
292		- fossil_fatal("cannot use --backout, --cherrypick or --integrate with a fork merge");
	292	+ fossil_fatal("cannot use --backout, --cherrypick or --integrate "
	293	+ "with a fork merge");
293	294	}
294	295	mid = fossil_find_nearest_fork(vid, db_open_local(0));
295	296	if( mid==0 ){
296	297	fossil_fatal("no unmerged forks of branch \"%s\"",
297	298	db_text(0, "SELECT value FROM tagxref"
		@@ -325,16 +326,17 @@
325	326	pid = name_to_typed_rid(zPivot, "ci");
326	327	if( pid==0 \|\| !is_a_version(pid) ){
327	328	fossil_fatal("not a version: %s", zPivot);
328	329	}
329	330	if( pickFlag ){
330		- fossil_fatal("incompatible options: --cherrypick & --baseline");
	331	+ fossil_fatal("incompatible options: --cherrypick and --baseline");
331	332	}
332	333	}
333	334	if( pickFlag \|\| backoutFlag ){
334	335	if( integrateFlag ){
335		- fossil_fatal("incompatible options: --integrate & --cherrypick or --backout");
	336	+ fossil_fatal("incompatible options: --integrate and --cherrypick "
	337	+ "with --backout");
336	338	}
337	339	pid = db_int(0, "SELECT pid FROM plink WHERE cid=%d AND isprim", mid);
338	340	if( pid<=0 ){
339	341	fossil_fatal("cannot find an ancestor for %s", g.argv[2]);
340	342	}
		@@ -379,11 +381,12 @@
379	381	if( integrateFlag && !is_a_leaf(mid)){
380	382	fossil_warning("ignoring --integrate: %s is not a leaf", g.argv[2]);
381	383	integrateFlag = 0;
382	384	}
383	385	if( verboseFlag ){
384		- print_checkin_description(mid, 12, integrateFlag?"integrate:":"merge-from:");
	386	+ print_checkin_description(mid, 12,
	387	+ integrateFlag ? "integrate:" : "merge-from:");
385	388	print_checkin_description(pid, 12, "baseline:");
386	389	}
387	390	vfile_check_signature(vid, CKSIG_ENOTFILE);
388	391	db_begin_transaction();
389	392	if( !dryRunFlag ) undo_begin();
390	393

	--- src/merge.c
	+++ src/merge.c
	@@ -287,11 +287,12 @@
287	** the leaf is not closed and (4) the leaf is in the same branch
288	** as the current checkout.
289	*/
290	Stmt q;
291	if( pickFlag \|\| backoutFlag \|\| integrateFlag){
292	fossil_fatal("cannot use --backout, --cherrypick or --integrate with a fork merge");

293	}
294	mid = fossil_find_nearest_fork(vid, db_open_local(0));
295	if( mid==0 ){
296	fossil_fatal("no unmerged forks of branch \"%s\"",
297	db_text(0, "SELECT value FROM tagxref"
	@@ -325,16 +326,17 @@
325	pid = name_to_typed_rid(zPivot, "ci");
326	if( pid==0 \|\| !is_a_version(pid) ){
327	fossil_fatal("not a version: %s", zPivot);
328	}
329	if( pickFlag ){
330	fossil_fatal("incompatible options: --cherrypick & --baseline");
331	}
332	}
333	if( pickFlag \|\| backoutFlag ){
334	if( integrateFlag ){
335	fossil_fatal("incompatible options: --integrate & --cherrypick or --backout");

336	}
337	pid = db_int(0, "SELECT pid FROM plink WHERE cid=%d AND isprim", mid);
338	if( pid<=0 ){
339	fossil_fatal("cannot find an ancestor for %s", g.argv[2]);
340	}
	@@ -379,11 +381,12 @@
379	if( integrateFlag && !is_a_leaf(mid)){
380	fossil_warning("ignoring --integrate: %s is not a leaf", g.argv[2]);
381	integrateFlag = 0;
382	}
383	if( verboseFlag ){
384	print_checkin_description(mid, 12, integrateFlag?"integrate:":"merge-from:");

385	print_checkin_description(pid, 12, "baseline:");
386	}
387	vfile_check_signature(vid, CKSIG_ENOTFILE);
388	db_begin_transaction();
389	if( !dryRunFlag ) undo_begin();
390

	--- src/merge.c
	+++ src/merge.c
	@@ -287,11 +287,12 @@
287	** the leaf is not closed and (4) the leaf is in the same branch
288	** as the current checkout.
289	*/
290	Stmt q;
291	if( pickFlag \|\| backoutFlag \|\| integrateFlag){
292	fossil_fatal("cannot use --backout, --cherrypick or --integrate "
293	"with a fork merge");
294	}
295	mid = fossil_find_nearest_fork(vid, db_open_local(0));
296	if( mid==0 ){
297	fossil_fatal("no unmerged forks of branch \"%s\"",
298	db_text(0, "SELECT value FROM tagxref"
	@@ -325,16 +326,17 @@
326	pid = name_to_typed_rid(zPivot, "ci");
327	if( pid==0 \|\| !is_a_version(pid) ){
328	fossil_fatal("not a version: %s", zPivot);
329	}
330	if( pickFlag ){
331	fossil_fatal("incompatible options: --cherrypick and --baseline");
332	}
333	}
334	if( pickFlag \|\| backoutFlag ){
335	if( integrateFlag ){
336	fossil_fatal("incompatible options: --integrate and --cherrypick "
337	"with --backout");
338	}
339	pid = db_int(0, "SELECT pid FROM plink WHERE cid=%d AND isprim", mid);
340	if( pid<=0 ){
341	fossil_fatal("cannot find an ancestor for %s", g.argv[2]);
342	}
	@@ -379,11 +381,12 @@
381	if( integrateFlag && !is_a_leaf(mid)){
382	fossil_warning("ignoring --integrate: %s is not a leaf", g.argv[2]);
383	integrateFlag = 0;
384	}
385	if( verboseFlag ){
386	print_checkin_description(mid, 12,
387	integrateFlag ? "integrate:" : "merge-from:");
388	print_checkin_description(pid, 12, "baseline:");
389	}
390	vfile_check_signature(vid, CKSIG_ENOTFILE);
391	db_begin_transaction();
392	if( !dryRunFlag ) undo_begin();
393

Fossil SCM

Keyboard Shortcuts