From: Sandeep Subramanian <sandeepsubramanian94@gmail.com>
To: guix-devel@gnu.org
Subject: Re: Rebasing guile-daemon branch onto master
Date: Sat, 28 Apr 2018 20:45:53 +0000 [thread overview]
Message-ID: <CAEMWfy=3wTGX6UJJEXrLQ1mY+8f5kR0DsQo5Kh9OU2p3KJULTg@mail.gmail.com> (raw)
In-Reply-To: <CAEMWfymOv+J_8nRTT=1Pd_4gwN=2FMuyhE3VVvM9Yn7466Xjfw@mail.gmail.com>
> 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.
Fixed the graph formatting.
(78a5205) (2472f7a) (master-HEAD)
*---------*--------*--------------------*
\ (c4395e7) \
\ \ (e338c9b)
\ *--------------*-*(guile-daemon-HEAD)
\ (36cc971) /
\ /
*---------------*--------------*
(654c8a7) (5e27bfc) (f5dfbaa)
--
Sandeep (uniq10)
next prev parent reply other threads:[~2018-04-28 20:46 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-28 19:10 Rebasing guile-daemon branch onto master Sandeep Subramanian
2018-04-28 20:45 ` Sandeep Subramanian [this message]
2018-04-28 22:40 ` Leo Famulari
2018-04-30 18:21 ` Sandeep Subramanian
2018-05-01 20:41 ` Ludovic Courtès
2018-05-02 7:42 ` Sandeep Subramanian
2018-05-09 9:43 ` Ricardo Wurmus
2018-05-09 18:38 ` Sandeep Subramanian
2018-05-09 22:03 ` Ludovic Courtès
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
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAEMWfy=3wTGX6UJJEXrLQ1mY+8f5kR0DsQo5Kh9OU2p3KJULTg@mail.gmail.com' \
--to=sandeepsubramanian94@gmail.com \
--cc=guix-devel@gnu.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.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).