Fossil

Differences From Artifact [2c986dc9e6]:

• File src/merge3.c — part of check-in [a426154b3e] at 2014-07-30 15:40:03 on branch verify-all-options — Call verify_all_options() on most of fossil CLI commands. - Skip all the test-* commands for now (may be unnecessary) - Skip sha1sum, md5sum and artifact because they can take "-" as argument and verify_all_options() would call fatal. Need to handle those differently... - Command with subcommands that have their options are remaining: branch, bisect, cache, configuration, json, sql, stash, tag, ticket, user, wiki. (not sure how to handle those yet..) (user: mgagnon size: 16754) [more...]

To Artifact [d07e371cc8]:

• File src/merge3.c — part of check-in [4e18dba698] at 2014-08-07 10:02:43 on branch trunk — "char const" -> "const char" and various other coding style improvements. No functional change. (user: jan.nijtmans size: 16749) [more...]

134
135
136
137
138
139
140
141
142
143
144
145
146
147
148

  }
  return i;
}

/*
** Text of boundary markers for merge conflicts.
*/
static char const * const mergeMarker[] = {
 /*123456789 123456789 123456789 123456789 123456789 123456789 123456789*/
  "<<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<<<<<\n",
  "======= COMMON ANCESTOR content follows ============================\n",
  "======= MERGED IN content follows ==================================\n",
  ">>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n"
};

|

134
135
136
137
138
139
140
141
142
143
144
145
146
147
148

  }
  return i;
}

/*
** Text of boundary markers for merge conflicts.
*/
static const char *const mergeMarker[] = {
 /*123456789 123456789 123456789 123456789 123456789 123456789 123456789*/
  "<<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<<<<<\n",
  "======= COMMON ANCESTOR content follows ============================\n",
  "======= MERGED IN content follows ==================================\n",
  ">>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n"
};

366
367
368
369
370
371
372
373
374
375
376
377
378
379
380

**      cp Xup.c Xbase.c
**      # Verify that everything still works
**      fossil commit
**
*/
void delta_3waymerge_cmd(void){
  Blob pivot, v1, v2, merged;
    
  /* We should be done with options.. */
  verify_all_options();

  if( g.argc!=6 ){
    usage("PIVOT V1 V2 MERGED");
  }
  if( blob_read_from_file(&pivot, g.argv[2])<0 ){

|

366
367
368
369
370
371
372
373
374
375
376
377
378
379
380

**      cp Xup.c Xbase.c
**      # Verify that everything still works
**      fossil commit
**
*/
void delta_3waymerge_cmd(void){
  Blob pivot, v1, v2, merged;

  /* We should be done with options.. */
  verify_all_options();

  if( g.argc!=6 ){
    usage("PIVOT V1 V2 MERGED");
  }
  if( blob_read_from_file(&pivot, g.argv[2])<0 ){