All of lore.kernel.org
 help / color / mirror / Atom feed
From: Brice Goglin <brice.goglin@gmail.com>
To: git@vger.kernel.org
Subject: git-svn mergeinfo
Date: Tue, 11 Sep 2012 14:01:01 +0200	[thread overview]
Message-ID: <504F27FD.6020204@gmail.com> (raw)

Hello,

I am using git 1.7.10.4 from Debian. I just tried svn.pushmergeinfo and
it seems to have worked fine, great.

Now I am trying to understand what the doc says about this:
"Currently, this can only be done when dcommitting non-fast-forward
merges where all parents but the first have already been pushed into SVN."

"all parents but the first have already been pushed into SVN" means that
merging A into B requires to dcommit in A first, right?
"non-fast-forward" means that both branches got some commits since the
last merge, right?

Could we add an example after the above doc sentence? Something like
"For instance, if merging SVN branch B into A, make sure you dcommit A
first, and check that both A and B got new commits since the last merge
(or since B was created from A)".

Brice

                 reply	other threads:[~2012-09-11 12:01 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=504F27FD.6020204@gmail.com \
    --to=brice.goglin@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.