Index: contrib/client-side/svnmerge.py =================================================================== --- contrib/client-side/svnmerge.py (revision 19340) +++ contrib/client-side/svnmerge.py (working copy) @@ -993,6 +993,18 @@ "revisions available to be merged are:", opts["head-url"]) +def action_hidden(branch_dir, branch_props): + "Show all blocked revisions for the given branch_dir." + + revs = get_blocked_revs(branch_dir, opts["head-path"]) + + # Limit to revisions specified by -r (if any) + if opts["revision"]: + revs = revs & RevisionSet(opts["revision"]) + + display_revisions(revs, opts["hidden-display"], + "revisions blocked from view are:", opts["head-url"]) + def action_integrated(branch_dir, branch_props): """Show change sets already merged. This set of revisions is calculated from taking svnmerge-integrated property from the @@ -1634,6 +1646,25 @@ [ "-f", "-r", "-S", # import common opts ]), + + "hidden": (action_hidden, + "hidden [OPTION...] [PATH]", + """Show the revisions blocked for PATH as a revision list. + If --revision is given, the revisions shown will be limited to + those also specified in the option.""", + [ + Option("-d", "--diff", + dest="hidden-display", + value="diffs", + default="revisions", + help="show corresponding diff instead of revision list"), + Option("-l", "--log", + dest="hidden-display", + value="logs", + help="show corresponding log history instead of revision list"), + "-r", + "-S", + ]), }