* [PATCH] git-svn: check_cherry_pick should exclude commits already in our history
@ 2010-09-02 16:46 Steven Walter
2010-09-02 21:47 ` Eric Wong
0 siblings, 1 reply; 3+ messages in thread
From: Steven Walter @ 2010-09-02 16:46 UTC (permalink / raw)
To: git, normalperson; +Cc: Steven Walter
From: Steven Walter <swalter@lpdev.prtdev.lexmark.com>
The merge-base between @$parents and $merge_tip may have been reached
through a merge commit. This means that some commits that are ancestors
of @$parents will not be ancestors of $merge_base. The mergeinfo
property will not list commits that are ancestors of @$parents, so we
need to explicitly exclude them.
---
git-svn.perl | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/git-svn.perl b/git-svn.perl
index 7a72f75..70edf80 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -3087,9 +3087,10 @@ sub _rev_list {
sub check_cherry_pick {
my $base = shift;
my $tip = shift;
+ my $parents = shift;
my @ranges = @_;
my %commits = map { $_ => 1 }
- _rev_list("--no-merges", $tip, "--not", $base);
+ _rev_list("--no-merges", $tip, "--not", $base, @$parents);
for my $range ( @ranges ) {
delete @commits{_rev_list($range)};
}
@@ -3249,6 +3250,7 @@ sub find_extra_svn_parents {
# double check that there are no missing non-merge commits
my (@incomplete) = check_cherry_pick(
$merge_base, $merge_tip,
+ $parents,
@$ranges,
);
--
1.7.0.5.gbc75a
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] git-svn: check_cherry_pick should exclude commits already in our history
2010-09-02 16:46 [PATCH] git-svn: check_cherry_pick should exclude commits already in our history Steven Walter
@ 2010-09-02 21:47 ` Eric Wong
2010-09-02 22:32 ` Steven Walter
0 siblings, 1 reply; 3+ messages in thread
From: Eric Wong @ 2010-09-02 21:47 UTC (permalink / raw)
To: Steven Walter; +Cc: git, Steven Walter, Sam Vilain
Steven Walter <stevenrwalter@gmail.com> wrote:
> From: Steven Walter <swalter@lpdev.prtdev.lexmark.com>
>
> The merge-base between @$parents and $merge_tip may have been reached
> through a merge commit. This means that some commits that are ancestors
> of @$parents will not be ancestors of $merge_base. The mergeinfo
> property will not list commits that are ancestors of @$parents, so we
> need to explicitly exclude them.
Thanks Steven, looks reasonable to me. Sign-off?
Sam: any objections?
Acked-by: Eric Wong <normalperson@yhbt.net>
> ---
> git-svn.perl | 4 +++-
> 1 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/git-svn.perl b/git-svn.perl
> index 7a72f75..70edf80 100755
> --- a/git-svn.perl
> +++ b/git-svn.perl
> @@ -3087,9 +3087,10 @@ sub _rev_list {
> sub check_cherry_pick {
> my $base = shift;
> my $tip = shift;
> + my $parents = shift;
> my @ranges = @_;
> my %commits = map { $_ => 1 }
> - _rev_list("--no-merges", $tip, "--not", $base);
> + _rev_list("--no-merges", $tip, "--not", $base, @$parents);
> for my $range ( @ranges ) {
> delete @commits{_rev_list($range)};
> }
> @@ -3249,6 +3250,7 @@ sub find_extra_svn_parents {
> # double check that there are no missing non-merge commits
> my (@incomplete) = check_cherry_pick(
> $merge_base, $merge_tip,
> + $parents,
> @$ranges,
> );
>
> --
^ permalink raw reply [flat|nested] 3+ messages in thread* [PATCH] git-svn: check_cherry_pick should exclude commits already in our history
2010-09-02 21:47 ` Eric Wong
@ 2010-09-02 22:32 ` Steven Walter
0 siblings, 0 replies; 3+ messages in thread
From: Steven Walter @ 2010-09-02 22:32 UTC (permalink / raw)
To: git, normalperson; +Cc: Steven Walter, Steven Walter
From: Steven Walter <swalter@lpdev.prtdev.lexmark.com>
The merge-base between @$parents and $merge_tip may have been reached
through a merge commit. This means that some commits that are ancestors
of @$parents will not be ancestors of $merge_base. The mergeinfo
property will not list commits that are ancestors of @$parents, so we
need to explicitly exclude them.
Signed-off-by: Steven Walter <stevenrwalter@gmail.com>
Acked-by: Eric Wong <normalperson@yhbt.net>
---
git-svn.perl | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/git-svn.perl b/git-svn.perl
index 9b046b6..c7c4dcd 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -3118,9 +3118,10 @@ sub _rev_list {
sub check_cherry_pick {
my $base = shift;
my $tip = shift;
+ my $parents = shift;
my @ranges = @_;
my %commits = map { $_ => 1 }
- _rev_list("--no-merges", $tip, "--not", $base);
+ _rev_list("--no-merges", $tip, "--not", $base, @$parents);
for my $range ( @ranges ) {
delete @commits{_rev_list($range)};
}
@@ -3296,6 +3297,7 @@ sub find_extra_svn_parents {
# double check that there are no missing non-merge commits
my (@incomplete) = check_cherry_pick(
$merge_base, $merge_tip,
+ $parents,
@$ranges,
);
--
1.7.0.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-09-02 22:32 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-02 16:46 [PATCH] git-svn: check_cherry_pick should exclude commits already in our history Steven Walter
2010-09-02 21:47 ` Eric Wong
2010-09-02 22:32 ` Steven Walter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).