subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Stefan Sperling <s...@elego.de>
Subject Re: 'svn incoming'
Date Tue, 08 May 2012 15:24:58 GMT
On Tue, May 08, 2012 at 06:12:00PM +0300, anatoly techtonik wrote:
> As I said `svn log -r BASE:HEAD' works ok, but not everybody
> proficient enough to know about it.

I'm not convinced that we need another subcommand for this.

If users have trouble discovering this functionality, what about
putting a hint into the output of 'svn help log'?

[[[
In the output of 'svn help log', provide an example that shows how
to view log messages for any changes the next 'svn update' will apply.

* subversion/svn/main.c
  (svn_cl__cmd_table): Add an example to 'svn help log': svn log -rBASE:HEAD

* subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout:
    Adjust expected output.
]]]

Index: subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
===================================================================
--- subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout	(revision 1335558)
+++ subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout	(working copy)
@@ -38,6 +38,10 @@ usage: 1. log [PATH][@REV]
     svn log http://www.example.com/repo/project foo.c bar.c
     svn log http://www.example.com/repo/project@50 foo.c bar.c
 
+    This command shows the log messages for any incoming changes
+    the next 'svn update' will apply:
+      svn log -rBASE:HEAD
+
     This command shows the log entry for the revision the branch
     ^/branches/foo was created in:
       svn log --stop-on-copy --limit 1 -r0:HEAD ^/branches/foo
Index: subversion/svn/main.c
===================================================================
--- subversion/svn/main.c	(revision 1335558)
+++ subversion/svn/main.c	(working copy)
@@ -681,6 +681,10 @@ const svn_opt_subcommand_desc2_t svn_cl__cmd_table
      "    svn log http://www.example.com/repo/project foo.c bar.c\n"
      "    svn log http://www.example.com/repo/project@50 foo.c bar.c\n"
      "\n"
+     "    This command shows the log messages for any incoming changes\n"
+     "    the next 'svn update' will apply:\n"
+     "      svn log -rBASE:HEAD\n"
+     "\n"
      "    This command shows the log entry for the revision the branch\n"
      "    ^/branches/foo was created in:\n"
      "      svn log --stop-on-copy --limit 1 -r0:HEAD ^/branches/foo\n"),

Mime
View raw message