* stgit, rebasing with 100 patches
@ 2009-10-01 23:04 Jon Smirl
2009-10-04 13:00 ` Jon Smirl
0 siblings, 1 reply; 3+ messages in thread
From: Jon Smirl @ 2009-10-01 23:04 UTC (permalink / raw)
To: Git Mailing List
I have 100 patches loaded into in stgit. My tree is at 2.6.30. Now I
want to rebase to 2.6.31-rc1. About 30 of these hundred patches got
committed in this interval.
If I rebase directly to 2.6.31-rc1 I end up with a bunch of merge
conflicts as the patches are applied. That's because patches 'a,b,c'
got applied in the merge window. When I push 'a' back down it sees the
combination of 'a,b,c' not just 'a'. It is unable to figure out that
'a' was applied and then 'b' and 'c' applied on top of it.
Is there a better way to locate the patches the got applied?
--
Jon Smirl
jonsmirl@gmail.com
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: stgit, rebasing with 100 patches
2009-10-01 23:04 stgit, rebasing with 100 patches Jon Smirl
@ 2009-10-04 13:00 ` Jon Smirl
2009-11-02 8:22 ` Karl Wiberg
0 siblings, 1 reply; 3+ messages in thread
From: Jon Smirl @ 2009-10-04 13:00 UTC (permalink / raw)
To: Git Mailing List
On Thu, Oct 1, 2009 at 7:04 PM, Jon Smirl <jonsmirl@gmail.com> wrote:
> I have 100 patches loaded into in stgit. My tree is at 2.6.30. Now I
> want to rebase to 2.6.31-rc1. About 30 of these hundred patches got
> committed in this interval.
>
> If I rebase directly to 2.6.31-rc1 I end up with a bunch of merge
> conflicts as the patches are applied. That's because patches 'a,b,c'
> got applied in the merge window. When I push 'a' back down it sees the
> combination of 'a,b,c' not just 'a'. It is unable to figure out that
> 'a' was applied and then 'b' and 'c' applied on top of it.
>
> Is there a better way to locate the patches the got applied?
A solution to this is to make an option on rebase that walks the patch
stack forward one commit at a time.
What does the --merged option do on stg rebase? The doc is rather sparse.
--
Jon Smirl
jonsmirl@gmail.com
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: stgit, rebasing with 100 patches
2009-10-04 13:00 ` Jon Smirl
@ 2009-11-02 8:22 ` Karl Wiberg
0 siblings, 0 replies; 3+ messages in thread
From: Karl Wiberg @ 2009-11-02 8:22 UTC (permalink / raw)
To: Jon Smirl; +Cc: Git Mailing List, Catalin Marinas
On Sun, Oct 4, 2009 at 2:00 PM, Jon Smirl <jonsmirl@gmail.com> wrote:
> On Thu, Oct 1, 2009 at 7:04 PM, Jon Smirl <jonsmirl@gmail.com> wrote:
>
> > Is there a better way to locate the patches the got applied?
>
> A solution to this is to make an option on rebase that walks the
> patch stack forward one commit at a time.
>
> What does the --merged option do on stg rebase? The doc is rather
> sparse.
Right, -m/--merged is what you want. Before applying any of the
patches, it tries to reverse-apply all of them in reverse
order---successful applications mean the patch was already in
upstream. It works surprisingly well.
--
Karl Wiberg, kha@treskal.com
www.treskal.com/kalle
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-11-02 8:55 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-10-01 23:04 stgit, rebasing with 100 patches Jon Smirl
2009-10-04 13:00 ` Jon Smirl
2009-11-02 8:22 ` Karl Wiberg
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).