Skip to contentSkip to conversation

Rebased for_next branch in my linux-fs git tree

DISCUSSION Jan Kara 2 participants 3 messages Jul 4, 2013 – Jul 5, 2013

lore
Share & tools
lore

Jan Kara

author
#0 lore raw

Hello Stephen,

I'm just writing this to let you know that I had to rebase for_next
branch in my linux-fs git tree because I've messed up my tree and for_linus & for_next branches contained the same patches but with different commit IDs (fast track fixes). When I pulled for_next into for_linus branch, the changelog had commit logs for those patches twice which was rather confusing. The only solution I found was to rebase for_next on top of for_linus to get rid of the duplicate patches. If there's a cleaner solution of the situation, I'm happy to learn it for future...

This is just that you know what's going on when you are doing your merge window statistics :).

Honza

Signature · 2 lines
Jan Kara <[email protected]>
SUSE Labs, CR
#1 lore raw

Hi Jan,

Quoted 2 lines · On Thu, 4 Jul 2013 19:43:04 +0200 Jan Kara <[email protected]> wrote:

I'm just writing this to let you know that I had to rebase for_next

                                                 ^^^

wrong choice of work, you "chose" to rebase. :-)

Quoted 7 lines

branch in my linux-fs git tree because I've messed up my tree and for_linus & for_next branches contained the same patches but with different commit IDs (fast track fixes). When I pulled for_next into for_linus branch, the changelog had commit logs for those patches twice which was rather confusing. The only solution I found was to rebase for_next on top of for_linus to get rid of the duplicate patches. If there's a cleaner solution of the situation, I'm happy to learn it for future...

Just leave it. Linus and I know how to cope with those (maybe explain to Linus what happened). In the future, if you put fixes in your for_linus branch and *need* those fixes in your for_next branch, then merge your for_linus branch into your for_next branch instead of cherry-picking the patches.

Signature · 2 lines
Cheers,
Stephen Rothwell                    [email protected]
#2 lore raw
Quoted 6 lines · On Fri, 5 Jul 2013 10:04:37 +1000 Stephen Rothwell <[email protected]> wrote:
Quoted 2 lines · On Thu, 4 Jul 2013 19:43:04 +0200 Jan Kara <[email protected]> wrote:

I'm just writing this to let you know that I had to rebase for_next

                                                 ^^^

wrong choice of work, you "chose" to rebase. :-)

                  ^^^^

word

Signature · 2 lines
Cheers,
Stephen Rothwell                    [email protected]