From: Eric Wong <normalperson@yhbt.net>
To: Michael Contreras <michael@inetric.com>
Cc: git@vger.kernel.org, Bryan Jacobs <bjacobs@woti.com>,
Avishay Lavie <avishay.lavie@gmail.com>,
Sam Vilain <sam.vilain@catalyst.net.nz>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] git-svn: avoid self-referencing mergeinfo
Date: Thu, 4 Apr 2013 01:31:31 +0000 [thread overview]
Message-ID: <20130404013131.GA18539@dcvr.yhbt.net> (raw)
In-Reply-To: <20130330220642.GA14641@gmail.com>
Michael Contreras <michael@inetric.com> wrote:
> When svn.pushmergeinfo is set, the target branch is included in the
> mergeinfo if it was previously merged into one of the source branches.
> SVN does not do this.
>
> Remove merge target branch path from resulting mergeinfo when
> svn.pushmergeinfo is set to better match the behavior of SVN. Update the
> svn-mergeinfo-push test.
>
> Signed-off-by: Michael Contreras <michael@inetric.com>
> Reported-by: Avishay Lavie <avishay.lavie@gmail.com>
Acked-by: Eric Wong <normalperson@yhbt.net>
80-column wrapped version pushed to git://bogomips.org/git-svn master
(commit e5ee78e1f0835410a37bfa38e1ff5e1a82f8c7b5)
Will ask Junio to pull unless Sam (our mergeinfo expert) gives a NACK
soon.
prev parent reply other threads:[~2013-04-04 1:32 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-30 22:06 [PATCH] git-svn: avoid self-referencing mergeinfo Michael Contreras
2013-04-04 1:31 ` Eric Wong [this message]
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=20130404013131.GA18539@dcvr.yhbt.net \
--to=normalperson@yhbt.net \
--cc=avishay.lavie@gmail.com \
--cc=bjacobs@woti.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=michael@inetric.com \
--cc=sam.vilain@catalyst.net.nz \
/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.