* [StGit PATCH] Fixed indeterminism in t2102-pull-policy-rebase
@ 2007-08-23 6:55 David Kågedal
2007-08-23 7:52 ` Karl Hasselström
0 siblings, 1 reply; 3+ messages in thread
From: David Kågedal @ 2007-08-23 6:55 UTC (permalink / raw)
To: git; +Cc: David Kågedal
Signed-off-by: David KÃ¥gedal <davidk@lysator.liu.se>
---
This test case was sometimes succeeding and sometimes failing. This
seems to be how it was expected to work.
t/t2102-pull-policy-rebase.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/t/t2102-pull-policy-rebase.sh b/t/t2102-pull-policy-rebase.sh
index 41f8168..670673d 100755
--- a/t/t2102-pull-policy-rebase.sh
+++ b/t/t2102-pull-policy-rebase.sh
@@ -10,8 +10,8 @@ test_description='Excercise pull-policy "rebase".'
test_expect_success \
'Fork stack off parent branch, and add patches to the stack' \
'
- stg init &
git branch -m master parent &&
+ stg init &&
stg branch --create stack &&
git repo-config branch.stack.stgit.pull-policy rebase &&
git repo-config --list &&
--
1.5.3.rc6.31.g3c3b
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [StGit PATCH] Fixed indeterminism in t2102-pull-policy-rebase
2007-08-23 6:55 [StGit PATCH] Fixed indeterminism in t2102-pull-policy-rebase David Kågedal
@ 2007-08-23 7:52 ` Karl Hasselström
2007-08-23 8:20 ` Karl Hasselström
0 siblings, 1 reply; 3+ messages in thread
From: Karl Hasselström @ 2007-08-23 7:52 UTC (permalink / raw)
To: David Kågedal; +Cc: git
On 2007-08-23 08:55:32 +0200, David Kågedal wrote:
> This test case was sometimes succeeding and sometimes failing. This
> seems to be how it was expected to work.
Oooh, evil.
--
Karl Hasselström, kha@treskal.com
www.treskal.com/kalle
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [StGit PATCH] Fixed indeterminism in t2102-pull-policy-rebase
2007-08-23 7:52 ` Karl Hasselström
@ 2007-08-23 8:20 ` Karl Hasselström
0 siblings, 0 replies; 3+ messages in thread
From: Karl Hasselström @ 2007-08-23 8:20 UTC (permalink / raw)
To: Catalin Marinas; +Cc: David Kågedal, git
On 2007-08-23 09:52:24 +0200, Karl Hasselström wrote:
> On 2007-08-23 08:55:32 +0200, David Kågedal wrote:
>
> > This test case was sometimes succeeding and sometimes failing.
> > This seems to be how it was expected to work.
>
> Oooh, evil.
The following changes since commit 7e97cc0590f29482af022340df84a43b98c657ce:
Yann Dirson (1):
Include contrib scripts in the release tarball.
are available in the git repository at:
git://repo.or.cz/stgit/kha.git fixes
David Kågedal (1):
Fixed indeterminism in t2102-pull-policy-rebase
Karl Hasselström (1):
Don't touch ref files manually
stgit/commands/branch.py | 5 +--
stgit/commands/common.py | 4 +--
stgit/git.py | 79 ++++++++++++++++++++++++-----------------
stgit/stack.py | 70 +++++++++++++++++++-----------------
t/t0001-subdir-branches.sh | 7 ++--
t/t1000-branch-create.sh | 30 +---------------
t/t1001-branch-rename.sh | 2 +-
t/t2102-pull-policy-rebase.sh | 2 +-
8 files changed, 92 insertions(+), 107 deletions(-)
--
Karl Hasselström, kha@treskal.com
www.treskal.com/kalle
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-08-23 8:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-08-23 6:55 [StGit PATCH] Fixed indeterminism in t2102-pull-policy-rebase David Kågedal
2007-08-23 7:52 ` Karl Hasselström
2007-08-23 8:20 ` Karl Hasselström
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).