[StGit PATCH] Fixed indeterminism in t2102-pull-policy-rebase

[StGit PATCH] Fixed indeterminism in t2102-pull-policy-rebase

[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

Re: [StGit PATCH] Fixed indeterminism in t2102-pull-policy-rebase

[Karl Hasselström]

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

Re: [StGit PATCH] Fixed indeterminism in t2102-pull-policy-rebase

[Karl Hasselström]

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