From dc88b4a1698ba2e132149ed631a3f1d5fa8e5fb2 Mon Sep 17 00:00:00 2001 From: Christine Poerschke Date: Fri, 4 Jun 2021 18:13:08 +0100 Subject: [PATCH 1/5] SOLR-15454, SOLR-14920: remove Lucene commits from .git-blame-ignore-revs and add Solr commits placeholder --- .git-blame-ignore-revs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 0fefb99f88cc..59dce4ce9d78 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -1,6 +1,2 @@ -# LUCENE-9570 [google java formatter applied] -6faa4f98e04817bf27d02d96332904a29fb7db69 -2d6ad2fee6dfd96388594f4de9b37c037efe8017 -8ef6a0da56878177ff8d6880c92e8f7d0321d076 -7f8b7ffbcad2265b047a5e2195f76cc924028063 -2cbf261032dc8aca56c846971c090c991ac594a6 +# SOLR-14920 [google java formatter applied] +# please add here From 2218131b691b4a34b314a3c56dcb4b9569fc1b4e Mon Sep 17 00:00:00 2001 From: Christine Poerschke Date: Mon, 7 Jun 2021 21:36:02 +0100 Subject: [PATCH 2/5] Update .git-blame-ignore-revs --- .git-blame-ignore-revs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 59dce4ce9d78..8b137891791f 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -1,2 +1 @@ -# SOLR-14920 [google java formatter applied] -# please add here + From 89694749067c2e1b9899eeb34d86c52218b49b1e Mon Sep 17 00:00:00 2001 From: Christine Poerschke Date: Mon, 7 Jun 2021 21:36:40 +0100 Subject: [PATCH 3/5] Update .git-blame-ignore-revs From 5a2b122c538296320af8e3710477598fb119b148 Mon Sep 17 00:00:00 2001 From: Christine Poerschke Date: Mon, 7 Jun 2021 21:37:07 +0100 Subject: [PATCH 4/5] Update .git-blame-ignore-revs From 1e3047072b94974cb69b06f5272e5f7bb2b39c57 Mon Sep 17 00:00:00 2001 From: Christine Poerschke Date: Tue, 8 Jun 2021 16:10:14 +0100 Subject: [PATCH 5/5] retain Lucene commits and comment w.r.t. why --- .git-blame-ignore-revs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 8b137891791f..62e6567e1862 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -1 +1,8 @@ - +# LUCENE-9570 [google java formatter applied] +# The apache/solr repo has its roots in the joint apache/lucene-solr repo. +# The following five "lucene" commits are from that joint root history. +6faa4f98e04817bf27d02d96332904a29fb7db69 +2d6ad2fee6dfd96388594f4de9b37c037efe8017 +8ef6a0da56878177ff8d6880c92e8f7d0321d076 +7f8b7ffbcad2265b047a5e2195f76cc924028063 +2cbf261032dc8aca56c846971c090c991ac594a6