Fossil

Check-in [cd0d6b4d]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Use "multiple leaves on the same branch" in stead of "ambiguous branch". Let's see if people like this better.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | sync-forkwarn
Files: files | file ages | folders
SHA1: cd0d6b4dda20173803e07fe4ed24c49b1d34e8cb
User & Date: jan.nijtmans 2015-04-27 20:46:08
Context
2015-04-27
21:00
Merge trunk. Change back one instance of "multiple leafs" to "fork": Here we are sure that it's really a "fork", not some other form of multiple leafs on the same branch. check-in: 35743de4 user: jan.nijtmans tags: sync-forkwarn
20:46
Use "multiple leaves on the same branch" in stead of "ambiguous branch". Let's see if people like this better. check-in: cd0d6b4d user: jan.nijtmans tags: sync-forkwarn
19:18
warning message fix check-in: b9fbfac5 user: jan.nijtmans tags: sync-forkwarn
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/checkin.c.

2117
2118
2119
2120
2121
2122
2123
2124
2125
2126
  }
  db_end_transaction(0);

  if( !g.markPrivate ){
    autosync_loop(SYNC_PUSH|SYNC_PULL, db_get_int("autosync-tries", 1));
  }
  if( count_nonbranch_children(vid)>1 ){
    fossil_print("**** warning: an ambiguous branch has occurred *****\n");
  }
}







|


2117
2118
2119
2120
2121
2122
2123
2124
2125
2126
  }
  db_end_transaction(0);

  if( !g.markPrivate ){
    autosync_loop(SYNC_PUSH|SYNC_PULL, db_get_int("autosync-tries", 1));
  }
  if( count_nonbranch_children(vid)>1 ){
    fossil_print("**** warning: multiple leaves on the same branch are formed *****\n");
  }
}

Changes to src/descendants.c.

459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
    fossil_print("%6s ", zLineNo);
    z = mprintf("%s [%S] %s", zDate, zId, zCom);
    comment_print(z, zCom, 7, width, g.comFmtFlags);
    fossil_free(z);
  }
  fossil_free(zLastBr);
  db_finalize(&q);
  if( showForks && !zLastBr ) fossil_print("*** OK, no ambiguous branch found ***\n");
}

/*
** WEBPAGE:  leaves
**
** Show leaf check-ins in a timeline.  By default only open leaves
** are listed.







|







459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
    fossil_print("%6s ", zLineNo);
    z = mprintf("%s [%S] %s", zDate, zId, zCom);
    comment_print(z, zCom, 7, width, g.comFmtFlags);
    fossil_free(z);
  }
  fossil_free(zLastBr);
  db_finalize(&q);
  if( showForks && !zLastBr ) fossil_print("*** OK, no multiple leaves on the same branch found ***\n");
}

/*
** WEBPAGE:  leaves
**
** Show leaf check-ins in a timeline.  By default only open leaves
** are listed.

Changes to src/info.c.

220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
    int rid;
    rid = name_to_rid(g.argv[2]);
    if( rid==0 ){
      fossil_fatal("no such object: %s\n", g.argv[2]);
    }
    show_common_info(rid, "uuid:", 1, 1);
  }
  fossil_print("ambiguous branches:\n");
  leaves_cmd();
}

/*
** Show information about all tags on a given check-in.
*/
static void showTags(int rid){







|







220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
    int rid;
    rid = name_to_rid(g.argv[2]);
    if( rid==0 ){
      fossil_fatal("no such object: %s\n", g.argv[2]);
    }
    show_common_info(rid, "uuid:", 1, 1);
  }
  fossil_print("multiple leaves on the same branch:\n");
  leaves_cmd();
}

/*
** Show information about all tags on a given check-in.
*/
static void showTags(int rid){

Changes to src/xfer.c.

1971
1972
1973
1974
1975
1976
1977
1978
1979
1980
1981
1982
  if( nErr && go==2 ){
    db_multi_exec("DROP TABLE onremote");
    manifest_crosslink_end(MC_PERMIT_HOOKS);
    content_enable_dephantomize(1);
    db_end_transaction(0);
  }
  if( (syncFlags & SYNC_CLONE)==0 && fossil_any_has_fork(g.rcvid) ){
    fossil_warning("***** WARNING: an ambiguous branch has occurred *****\n"
                   "use \"fossil info\" for more details.");
  }
  return nErr;
}







|




1971
1972
1973
1974
1975
1976
1977
1978
1979
1980
1981
1982
  if( nErr && go==2 ){
    db_multi_exec("DROP TABLE onremote");
    manifest_crosslink_end(MC_PERMIT_HOOKS);
    content_enable_dephantomize(1);
    db_end_transaction(0);
  }
  if( (syncFlags & SYNC_CLONE)==0 && fossil_any_has_fork(g.rcvid) ){
    fossil_warning("***** WARNING: multiple leaves on the same branch are formed *****\n"
                   "use \"fossil info\" for more details.");
  }
  return nErr;
}