# # # patch "ChangeLog" # from [433d30e96ae5de0e4f1134d94a6bdae3ca66a512] # to [3ad3d33c9b467ce61099af5312c87fac8e825c5a] # # patch "monotone.texi" # from [ae3cdce4c5063e2b37186e7c3f67b56ed13f2582] # to [c5bea87b22f67e3404db5a4b5bcf0fe767919223] # # patch "roster.cc" # from [5165b5be5f975f2b3b03aca359dfa21ba71462fa] # to [4c069ccd18ed3a6dc3e9c99aa13ea41bafbb2fb6] # ============================================================ --- ChangeLog 433d30e96ae5de0e4f1134d94a6bdae3ca66a512 +++ ChangeLog 3ad3d33c9b467ce61099af5312c87fac8e825c5a @@ -1,3 +1,12 @@ +2006-03-12 Nathaniel Smith + + * monotone.texi (Selectors): Remove line noise. + Also, add an example for c:. + + * roster.cc (update_restricted_roster_from_filesystem): Put back + hint about drop --missing, revert --missing that was lost in + transition to rosters. + 2006-03-12 Matthew Gregan * paths.cc, annotate.cc, xdelta.cc: Fix the signed vs unsigned ============================================================ --- monotone.texi ae3cdce4c5063e2b37186e7c3f67b56ed13f2582 +++ monotone.texi c5bea87b22f67e3404db5a4b5bcf0fe767919223 @@ -2564,7 +2564,7 @@ @heading Selectors in detail A selector is a combination of a selector type, which is a single -xoASCII character, followed by a @code{:} character and a selector +ASCII character, followed by a @code{:} character and a selector string. All selectors strings except for selector type @code{c} are just values. The value is matched against identifiers or certs, depending on its type, in an attempt to match a single revision. @@ -2577,7 +2577,10 @@ @var{name} or @address@hidden@var{value}. The former syntax will select any revision that has a cert with that name, regardless of value; the latter will match any revision that has a cert with that -name and value. Values to match for can have shell wildcards. +name and value. Values to match for can have shell wildcards. For +example, @code{c:tag} matches all revisions that have a tag, and address@hidden:tag=monotone-0.25} will match the revision tagged address@hidden (See also the @code{t} selector below.) @item Author selection Uses selector type @code{a}. For example, @code{a:graydon} matches @code{author} certs where the cert value contains @code{graydon}. ============================================================ --- roster.cc 5165b5be5f975f2b3b03aca359dfa21ba71462fa +++ roster.cc 4c069ccd18ed3a6dc3e9c99aa13ea41bafbb2fb6 @@ -2100,11 +2100,13 @@ } N(missing_files == 0, - F("%d missing files\n" + F("%d missing files; use '%s ls missing' to view\n" "to restore consistency, on each missing file run either\n" "'%s drop FILE' to remove it permanently, or\n" - "'%s revert FILE' to restore it\n") - % missing_files % app.prog_name % app.prog_name); + "'%s revert FILE' to restore it\n" + "or to handle all at once, simply 'monotone drop --missing'\n" + "or 'monotone revert --missing'") + % missing_files % app.prog_name % app.prog_name % app.prog_name); } void