Fossil SCM

Oops... merge typos fix w/ [bdac9f7238], commited at nearly same time.

bharder 2008-08-14 05:05 trunk merge
Commit 48c00d0bd3ade310d798fbaf7a9ed152d2450748
Parent bdac9f723842a42…
2 files changed +19 -2 +19 -2
~ src/checkin.c ~ src/checkin.c
M src/checkin.c
+19 -2
--- src/checkin.c
+++ src/checkin.c
@@ -250,11 +250,22 @@
250250
 }
251251
 if( zEditor==0 ){
252252
 zEditor = getenv("EDITOR");
253253
 }
254254
 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 <<<<<<<<
255264
 zEditor = "ed";
265
+#endif
266
+>>>>>>>>> END MERGE CONFLICT <<<<<<<<<
256267
 }
257268
 zFile = db_text(0, "SELECT '%qci-comment-' || hex(randomblob(6)) || '.txt'",
258269
 g.zLocalRoot);
259270
 #ifdef __MINGW32__
260271
 blob_add_cr(&text);
@@ -329,11 +340,14 @@
329340
 **
330341
 ** Usage: %fossil commit ?-m COMMENT? ?--nosign? ?FILE...?
331342
 **
332343
 ** Create a new version containing all of the changes in the current
333344
 ** checkout. You will be prompted to enter a check-in comment unless
334
-** the "-m" option is used to specify a command line. You will be
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 <<<<<<<<<
335349
 ** prompted for your GPG passphrase in order to sign the new manifest
336350
 ** unless the "--nosign" options is used. All files that have
337351
 ** changed will be committed unless some subset of files is specified
338352
 ** on the command line.
339353
 */
@@ -593,11 +607,14 @@
593607
 /*
594608
 ** COMMAND: test-import-manifest
595609
 **
596610
 ** Usage: %fossil test-import-manifest DATE COMMENT ?-p PARENT_RECORDID?... ?-f (FILE_RECORDID PATH)?...
597611
 **
598
-** Create a new version containing containing the specified file
612
+>>>>>>>> BEGIN MERGE CONFLICT <<<<<<<<
613
+**
614
+** Create a new version containing the specified file
615
+>>>>>>>>> END MERGE CONFLICT <<<<<<<<<
599616
 ** revisions (if any), and child of the given PARENT version.
600617
 */
601618
 void import_manifest_cmd(void){
602619
 const char* zDate; /* argument - timestamp, as seconds since epoch (int) */
603620
 const char* zComment; /* argument - manifest comment */
604621
--- src/checkin.c
+++ src/checkin.c
@@ -250,11 +250,22 @@
250 }
251 if( zEditor==0 ){
252 zEditor = getenv("EDITOR");
253 }
254 if( zEditor==0 ){
 
 
 
 
 
 
 
 
 
255 zEditor = "ed";
 
 
256 }
257 zFile = db_text(0, "SELECT '%qci-comment-' || hex(randomblob(6)) || '.txt'",
258 g.zLocalRoot);
259 #ifdef __MINGW32__
260 blob_add_cr(&text);
@@ -329,11 +340,14 @@
329 **
330 ** Usage: %fossil commit ?-m COMMENT? ?--nosign? ?FILE...?
331 **
332 ** Create a new version containing all of the changes in the current
333 ** checkout. You will be prompted to enter a check-in comment unless
334 ** the "-m" option is used to specify a command line. You will be
 
 
 
335 ** prompted for your GPG passphrase in order to sign the new manifest
336 ** unless the "--nosign" options is used. All files that have
337 ** changed will be committed unless some subset of files is specified
338 ** on the command line.
339 */
@@ -593,11 +607,14 @@
593 /*
594 ** COMMAND: test-import-manifest
595 **
596 ** Usage: %fossil test-import-manifest DATE COMMENT ?-p PARENT_RECORDID?... ?-f (FILE_RECORDID PATH)?...
597 **
598 ** Create a new version containing containing the specified file
 
 
 
599 ** revisions (if any), and child of the given PARENT version.
600 */
601 void import_manifest_cmd(void){
602 const char* zDate; /* argument - timestamp, as seconds since epoch (int) */
603 const char* zComment; /* argument - manifest comment */
604
--- src/checkin.c
+++ src/checkin.c
@@ -250,11 +250,22 @@
250 }
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);
@@ -329,11 +340,14 @@
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 */
@@ -593,11 +607,14 @@
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
M src/checkin.c
+19 -2
--- src/checkin.c
+++ src/checkin.c
@@ -250,11 +250,22 @@
250250
 }
251251
 if( zEditor==0 ){
252252
 zEditor = getenv("EDITOR");
253253
 }
254254
 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 <<<<<<<<
255264
 zEditor = "ed";
265
+#endif
266
+>>>>>>>>> END MERGE CONFLICT <<<<<<<<<
256267
 }
257268
 zFile = db_text(0, "SELECT '%qci-comment-' || hex(randomblob(6)) || '.txt'",
258269
 g.zLocalRoot);
259270
 #ifdef __MINGW32__
260271
 blob_add_cr(&text);
@@ -329,11 +340,14 @@
329340
 **
330341
 ** Usage: %fossil commit ?-m COMMENT? ?--nosign? ?FILE...?
331342
 **
332343
 ** Create a new version containing all of the changes in the current
333344
 ** checkout. You will be prompted to enter a check-in comment unless
334
-** the "-m" option is used to specify a command line. You will be
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 <<<<<<<<<
335349
 ** prompted for your GPG passphrase in order to sign the new manifest
336350
 ** unless the "--nosign" options is used. All files that have
337351
 ** changed will be committed unless some subset of files is specified
338352
 ** on the command line.
339353
 */
@@ -593,11 +607,14 @@
593607
 /*
594608
 ** COMMAND: test-import-manifest
595609
 **
596610
 ** Usage: %fossil test-import-manifest DATE COMMENT ?-p PARENT_RECORDID?... ?-f (FILE_RECORDID PATH)?...
597611
 **
598
-** Create a new version containing containing the specified file
612
+>>>>>>>> BEGIN MERGE CONFLICT <<<<<<<<
613
+**
614
+** Create a new version containing the specified file
615
+>>>>>>>>> END MERGE CONFLICT <<<<<<<<<
599616
 ** revisions (if any), and child of the given PARENT version.
600617
 */
601618
 void import_manifest_cmd(void){
602619
 const char* zDate; /* argument - timestamp, as seconds since epoch (int) */
603620
 const char* zComment; /* argument - manifest comment */
604621
--- src/checkin.c
+++ src/checkin.c
@@ -250,11 +250,22 @@
250 }
251 if( zEditor==0 ){
252 zEditor = getenv("EDITOR");
253 }
254 if( zEditor==0 ){
 
 
 
 
 
 
 
 
 
255 zEditor = "ed";
 
 
256 }
257 zFile = db_text(0, "SELECT '%qci-comment-' || hex(randomblob(6)) || '.txt'",
258 g.zLocalRoot);
259 #ifdef __MINGW32__
260 blob_add_cr(&text);
@@ -329,11 +340,14 @@
329 **
330 ** Usage: %fossil commit ?-m COMMENT? ?--nosign? ?FILE...?
331 **
332 ** Create a new version containing all of the changes in the current
333 ** checkout. You will be prompted to enter a check-in comment unless
334 ** the "-m" option is used to specify a command line. You will be
 
 
 
335 ** prompted for your GPG passphrase in order to sign the new manifest
336 ** unless the "--nosign" options is used. All files that have
337 ** changed will be committed unless some subset of files is specified
338 ** on the command line.
339 */
@@ -593,11 +607,14 @@
593 /*
594 ** COMMAND: test-import-manifest
595 **
596 ** Usage: %fossil test-import-manifest DATE COMMENT ?-p PARENT_RECORDID?... ?-f (FILE_RECORDID PATH)?...
597 **
598 ** Create a new version containing containing the specified file
 
 
 
599 ** revisions (if any), and child of the given PARENT version.
600 */
601 void import_manifest_cmd(void){
602 const char* zDate; /* argument - timestamp, as seconds since epoch (int) */
603 const char* zComment; /* argument - manifest comment */
604
--- src/checkin.c
+++ src/checkin.c
@@ -250,11 +250,22 @@
250 }
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);
@@ -329,11 +340,14 @@
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 */
@@ -593,11 +607,14 @@
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

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button