Differences From Artifact [bc5a0f847a]:

• File src/xfer.c — part of check-in [64b221aacf] at 2015-04-23 00:35:34 on branch sync-forkwarn — Only check leaves for forks on multi-child nodes. This prevents warnings from being extra verbose when a commit is made on any of the forks. (user: andybradford size: 61634) [more...]

To Artifact [d41f8a41ef]:

• File src/xfer.c — part of check-in [4359bd8df2] at 2015-04-26 17:12:08 on branch sync-forkwarn — Combine "fossil forks" with "fossil info" command (user: jan.nijtmans size: 61647)

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: a fork has occurred ***** use "
                   "\"fossil forks\" 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: an ambigeous branch has occurred *****\n"
                   "Use \"fossil info\" for more details.");
  }
  return nErr;
}