Thread (6 messages) flat view 6 messages, 2 authors, 2016-06-15

Re: [StGIT PATCH] Test "stg rebase" after "stg commit"

From: Karl Hasselström <hidden>
Date: 2016-06-15 22:43:08

On 2007-05-04 10:13:21 +0200, Karl Hasselström wrote:
  2. Try to commit a patch, and then rebase. This doesn't work,
     because "stg rebase" aborts if orig-base != base, and "stg
     commit" doesn't update orig-base. (It does work if "stg rebase"
     is given the --force flag.)

(2) shows a bug in "stg rebase"'s safety logic. I'm not sure how to
fix it, because I don't know how it's supposed to work in the first
place. (An obvious fix would be to update it whenever the base
changes, but that'll take some work, and I'm not convinced it can't
be done with les work. Yes, I'm lazy.) Yann, could you explain?
Another reason why this is impractical is that it's not only stgit
that's allowed to change the base. For example, doing "stg pop -a &&
git reset --hard foobar && stg rebase qwrtflsptk" will also trigger
the alarm.

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help