From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sandeep Subramanian Subject: Rebasing guile-daemon branch onto master Date: Sat, 28 Apr 2018 19:10:00 +0000 Message-ID: Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:52333) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fCVEb-0006hw-Bw for guix-devel@gnu.org; Sat, 28 Apr 2018 15:10:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fCVEa-0007Dt-Df for guix-devel@gnu.org; Sat, 28 Apr 2018 15:10:13 -0400 Received: from mail-qt0-x22d.google.com ([2607:f8b0:400d:c0d::22d]:38588) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fCVEa-0007DX-8H for guix-devel@gnu.org; Sat, 28 Apr 2018 15:10:12 -0400 Received: by mail-qt0-x22d.google.com with SMTP id z23-v6so6561347qti.5 for ; Sat, 28 Apr 2018 12:10:11 -0700 (PDT) List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org Hi all, I was trying to rebase the guile-daemon branch onto the master branch and I have some trouble doing it. The interactive git rebase showed me that there are 932 commits to be picked but most of them had no relation to the daemon code (Most commits were package addition/update commits.) I also tried `git cherry master guile-daemon` and that too showed 932 "+ commits" and 0 "- commits". The graph looks something like: (78a5205) (2472f7a) (master-HEAD) *----------------*--------------------*-----------------------------* \ (c4395e7) \ \ \ (e338c9b) \ *-----------------------*-* (6dee54f - guile-daemon HEAD) \ (36cc971) / *-----------------------*--------------------------------* (654c8a7) (5e27bfc) (f5dfbaa) A lot of commits on the guile daemon section of the branch are also found between 78a5205 and 2472f7a. For example both c4395e7 and 5e27bfc are the exact same patches and have the same patch-id. And almost all the 932 commits have a duplicate patch. I think this is the reason why both rebase and cherry are showing a lot of redundant commits. To verify, I created an orphaned branch "orphan" from the 78a5205 commit and and did `git cherry-pick 2472f7a..guile-daemon`. Then a `git cherry master orphan` revealed 30 "+ commits" and 902 "- commits". `git diff guile-daemon orphan` was empty and the 30 "+ commits" corresponded to the 30 commits by Caleb Ristvedt. Shall I now rebase by picking only these 30 commits? I don't know if what I am doing is right. I could use some guidance and criticism now. -- Sandeep (uniq10)