git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v2] git-svn: clarify the referent of dcommit's optional argument

From
Jon Seymour <jon.seymour@gmail.com>
Date
May 14, 2012, 12:48 UTC
Message-ID
<CAH3Anroxjn6sCBYa71Y-H1AvitiFn=dRUapGxgQ1Nu6=Tf03Uw@mail.gmail.com>
In-Reply-To
<1336978405-17943-1-git-send-email-jon.seymour@gmail.com>
On Mon, May 14, 2012 at 4:53 PM, Jon Seymour <jon.seymour@gmail.com> wrote:
Show 40 quoted lines
> The documentation of the dcommit subcommand is reworded to clarify that
> the optional argument refers to a git branch, not an SVN branch.
>
> The discussion of the optional argument is put into its own paragraph
> as is the guidance about using 'dcommit' in preference to 'set-tree'.
>
> Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
> ---
>  Documentation/git-svn.txt | 14 ++++++++------
>  1 file changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
> index 34ee785..27c4840 100644
> --- a/Documentation/git-svn.txt
> +++ b/Documentation/git-svn.txt
> @@ -189,18 +189,20 @@ and have no uncommitted changes.
>        last fetched commit from the upstream SVN.
>
>  'dcommit'::
> -       Commit each diff from a specified head directly to the SVN
> +       Commit each diff from the current branch directly to the SVN
>        repository, and then rebase or reset (depending on whether or
>        not there is a diff between SVN and head).  This will create
>        a revision in SVN for each commit in git.
>        It is recommended that you run 'git svn' fetch and rebase (not
>        pull or merge) your commits against the latest changes in the
>        SVN repository.
> -       An optional revision or branch argument may be specified, and
> -       causes 'git svn' to do all work on that revision/branch
> -       instead of HEAD.
> -       This is advantageous over 'set-tree' (below) because it produces
> -       cleaner, more linear history.
> ++
> +When an optional git branch name (or a git commit object name)
> +is specified as an argument, the subcommand works on the specified
> +branch, not on the current branch.
> ++
> +Use of 'dcommit' is preferred to 'set-tree' (below) because it produces
> +cleaner, more linear history.
>  +

Mmmm. I wonder if I should have left the original wording of this paragraph, but switched the order with respect to the disucssion of the optional argument, so that the text reads:

    It is recommended that you run 'git svn' fetch and rebase (not
pull or merge) your commits against the latest changes in the  SVN
repository.
    This is advantageous over'set-tree' (below) because it produces
cleaner, more linear history.
    When an optional git branch name (or a git commit object name) is
specified as an argument, the subcommand works on
    the specified branch, not on the current branch.
Show 5 quoted lines
>  --no-rebase;;
>        After committing, do not rebase or reset.
> --
> 1.7.10.1.514.ge33c7ea
>
Previous: Jon SeymourNext: Junio C Hamano
Message 2 of 7 in “git-svn: clarify the referent of dcommit's optional argument”
  1. git-svn: clarify the referent of dcommit's optional argumentJon Seymour, May 14, 2012
  2. Jon SeymourMay 14, 2012
  3. Junio C HamanoMay 14, 2012
  4. Jon SeymourMay 15, 2012
  5. Junio C HamanoMay 15, 2012
  6. Eric WongMay 16, 2012
  7. Thomas RastMay 18, 2012

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.