Index: src/descendants.c ================================================================== --- src/descendants.c +++ src/descendants.c @@ -351,18 +351,18 @@ Stmt q; Blob sql; int showAll = find_option("all", "a", 0)!=0; int showClosed = find_option("closed", "c", 0)!=0; int recomputeFlag = find_option("recompute",0,0)!=0; - int byBranch = find_option("bybranch",0,0)!=0; - int multipleFlag = find_option("multiple","m",0)!=0; + int showForks = g.argv[1][0]!='l'; + int multipleFlag = (find_option("multiple","m",0))!=0 || showForks; + int byBranch = (find_option("bybranch",0,0)!=0) || multipleFlag; const char *zWidth = find_option("width","W",1); char *zLastBr = 0; int n, width; char zLineNo[10]; - if( multipleFlag ) byBranch = 1; if( zWidth ){ width = atoi(zWidth); if( (width!=0) && (width<=39) ){ fossil_fatal("-W|--width value must be >39 or 0"); } @@ -429,10 +429,14 @@ const char *zCom = db_column_text(&q, 3); const char *zBr = db_column_text(&q, 7); char *z; if( byBranch && fossil_strcmp(zBr, zLastBr)!=0 ){ + if( showForks ){ + fossil_print("WARNING: multiple open leaves on the following branches:\n"); + showForks = 0; + } fossil_print("*** %s ***\n", zBr); fossil_free(zLastBr); zLastBr = fossil_strdup(zBr); if( multipleFlag ) n = 0; } Index: src/info.c ================================================================== --- src/info.c +++ src/info.c @@ -222,10 +222,11 @@ if( rid==0 ){ fossil_fatal("no such object: %s\n", g.argv[2]); } show_common_info(rid, "uuid:", 1, 1); } + leaves_cmd(); } /* ** Show information about all tags on a given check-in. */ Index: src/xfer.c ================================================================== --- src/xfer.c +++ src/xfer.c @@ -1974,9 +1974,9 @@ content_enable_dephantomize(1); db_end_transaction(0); } if( (syncFlags & SYNC_CLONE)==0 && g.rcvid && fossil_any_has_fork(g.rcvid) ){ fossil_warning("***** WARNING: a fork has occurred *****\n" - "use \"fossil leaves -multiple\" for more details."); + "use \"fossil info\" for more details."); } return nErr; }