Fossil SCM

Third time lucky? Commit changes, with merge applied only once. (so not filled with MERGE CONFLICT messages)

bharder 2008-08-14 05:27 trunk

Commit 16e308106f96879f9ac2812e592d8596aa9392a6

Parent 48c00d0bd3ade31…

1 file changed -13

M src/checkin.c

-13

		--- src/checkin.c
		+++ src/checkin.c
		@@ -251,21 +251,14 @@
251	251	if( zEditor==0 ){
252	252	zEditor = getenv("EDITOR");
253	253	}
254	254	if( zEditor==0 ){
255	255	#ifdef __MINGW32__
256		->>>>>>>> BEGIN MERGE CONFLICT <<<<<<<<
257		-#ifdef __MINGW32__
258		- zEditor = "notepad";
259	256	zEditor = "notepad";
260	257	#else
261		->>>>>>>>> END MERGE CONFLICT <<<<<<<<<
262		- zEditor = "ed";
263		->>>>>>>> BEGIN MERGE CONFLICT <<<<<<<<
264	258	zEditor = "ed";
265	259	#endif
266		->>>>>>>>> END MERGE CONFLICT <<<<<<<<<
267	260	}
268	261	zFile = db_text(0, "SELECT '%qci-comment-' \|\| hex(randomblob(6)) \|\| '.txt'",
269	262	g.zLocalRoot);
270	263	#ifdef __MINGW32__
271	264	blob_add_cr(&text);
		@@ -340,14 +333,11 @@
340	333	**
341	334	** Usage: %fossil commit ?-m COMMENT? ?--nosign? ?FILE...?
342	335	**
343	336	** Create a new version containing all of the changes in the current
344	337	** checkout. You will be prompted to enter a check-in comment unless
345		->>>>>>>> BEGIN MERGE CONFLICT <<<<<<<<
346		-** checkout. You will be prompted to enter a check-in comment unless
347	338	** the "-m" option is used to specify a comment line. You will be
348		->>>>>>>>> END MERGE CONFLICT <<<<<<<<<
349	339	** prompted for your GPG passphrase in order to sign the new manifest
350	340	** unless the "--nosign" options is used. All files that have
351	341	** changed will be committed unless some subset of files is specified
352	342	** on the command line.
353	343	*/
		@@ -607,14 +597,11 @@
607	597	/*
608	598	** COMMAND: test-import-manifest
609	599	**
610	600	** Usage: %fossil test-import-manifest DATE COMMENT ?-p PARENT_RECORDID?... ?-f (FILE_RECORDID PATH)?...
611	601	**
612		->>>>>>>> BEGIN MERGE CONFLICT <<<<<<<<
613		-**
614	602	** Create a new version containing the specified file
615		->>>>>>>>> END MERGE CONFLICT <<<<<<<<<
616	603	** revisions (if any), and child of the given PARENT version.
617	604	*/
618	605	void import_manifest_cmd(void){
619	606	const char* zDate; /* argument - timestamp, as seconds since epoch (int) */
620	607	const char* zComment; /* argument - manifest comment */
621	608

	--- src/checkin.c
	+++ src/checkin.c
	@@ -251,21 +251,14 @@
251	if( zEditor==0 ){
252	zEditor = getenv("EDITOR");
253	}
254	if( zEditor==0 ){
255	#ifdef __MINGW32__
256	>>>>>>>> BEGIN MERGE CONFLICT <<<<<<<<
257	#ifdef __MINGW32__
258	zEditor = "notepad";
259	zEditor = "notepad";
260	#else
261	>>>>>>>>> END MERGE CONFLICT <<<<<<<<<
262	zEditor = "ed";
263	>>>>>>>> BEGIN MERGE CONFLICT <<<<<<<<
264	zEditor = "ed";
265	#endif
266	>>>>>>>>> END MERGE CONFLICT <<<<<<<<<
267	}
268	zFile = db_text(0, "SELECT '%qci-comment-' \|\| hex(randomblob(6)) \|\| '.txt'",
269	g.zLocalRoot);
270	#ifdef __MINGW32__
271	blob_add_cr(&text);
	@@ -340,14 +333,11 @@
340	**
341	** Usage: %fossil commit ?-m COMMENT? ?--nosign? ?FILE...?
342	**
343	** Create a new version containing all of the changes in the current
344	** checkout. You will be prompted to enter a check-in comment unless
345	>>>>>>>> BEGIN MERGE CONFLICT <<<<<<<<
346	** checkout. You will be prompted to enter a check-in comment unless
347	** the "-m" option is used to specify a comment line. You will be
348	>>>>>>>>> END MERGE CONFLICT <<<<<<<<<
349	** prompted for your GPG passphrase in order to sign the new manifest
350	** unless the "--nosign" options is used. All files that have
351	** changed will be committed unless some subset of files is specified
352	** on the command line.
353	*/
	@@ -607,14 +597,11 @@
607	/*
608	** COMMAND: test-import-manifest
609	**
610	** Usage: %fossil test-import-manifest DATE COMMENT ?-p PARENT_RECORDID?... ?-f (FILE_RECORDID PATH)?...
611	**
612	>>>>>>>> BEGIN MERGE CONFLICT <<<<<<<<
613	**
614	** Create a new version containing the specified file
615	>>>>>>>>> END MERGE CONFLICT <<<<<<<<<
616	** revisions (if any), and child of the given PARENT version.
617	*/
618	void import_manifest_cmd(void){
619	const char* zDate; /* argument - timestamp, as seconds since epoch (int) */
620	const char* zComment; /* argument - manifest comment */
621

	--- src/checkin.c
	+++ src/checkin.c
	@@ -251,21 +251,14 @@
251	if( zEditor==0 ){
252	zEditor = getenv("EDITOR");
253	}
254	if( zEditor==0 ){
255	#ifdef __MINGW32__



256	zEditor = "notepad";
257	#else



258	zEditor = "ed";
259	#endif

260	}
261	zFile = db_text(0, "SELECT '%qci-comment-' \|\| hex(randomblob(6)) \|\| '.txt'",
262	g.zLocalRoot);
263	#ifdef __MINGW32__
264	blob_add_cr(&text);
	@@ -340,14 +333,11 @@
333	**
334	** Usage: %fossil commit ?-m COMMENT? ?--nosign? ?FILE...?
335	**
336	** Create a new version containing all of the changes in the current
337	** checkout. You will be prompted to enter a check-in comment unless


338	** the "-m" option is used to specify a comment line. You will be

339	** prompted for your GPG passphrase in order to sign the new manifest
340	** unless the "--nosign" options is used. All files that have
341	** changed will be committed unless some subset of files is specified
342	** on the command line.
343	*/
	@@ -607,14 +597,11 @@
597	/*
598	** COMMAND: test-import-manifest
599	**
600	** Usage: %fossil test-import-manifest DATE COMMENT ?-p PARENT_RECORDID?... ?-f (FILE_RECORDID PATH)?...
601	**


602	** Create a new version containing the specified file

603	** revisions (if any), and child of the given PARENT version.
604	*/
605	void import_manifest_cmd(void){
606	const char* zDate; /* argument - timestamp, as seconds since epoch (int) */
607	const char* zComment; /* argument - manifest comment */
608

Fossil SCM

Keyboard Shortcuts