Hi,

So here is the latest status of the Windows buildbot:
        conflict-doppleganger.sh
        overriding-defaults.sh
        pull_many_files.sh
        time-stamps.sh

Whereas before, these tests failed:
        conflict-doppleganger.sh
        hashed_inventory.sh
        issue844_gzip_crc.sh
        overriding-defaults.sh
        time-stamps.sh

It's interesting that we have solved two failures but gained a new one
in the process.  I attach the logs both before and after.  These are
the same as
http://buildbot.darcs.net/builders/zooko%20allmydata%20virtual2%20Windows-XP%20i386/builds/222/steps/test/logs/stdio/text
http://buildbot.darcs.net/builders/zooko%20allmydata%20virtual2%20Windows-XP%20i386/builds/243/steps/test/logs/stdio/text

-- 
Eric Kow <http://www.nltg.brighton.ac.uk/home/Eric.Kow>
PGP Key ID: 08AC04F9
[ghc] hspwd
[1 of 1] Compiling Main             ( tests/hspwd.hs, tests/hspwd.o )
Linking hspwd.exe ...
Applying functional tests to darcs-2 repositories...
test ! -e test-darcs-2 || chmod -R u+rwx test-darcs-2
rm -rf test-darcs-2
cp -R tests test-darcs-2
mkdir -p test-darcs-2/.darcs
echo >>test-darcs-2/.darcs/defaults ALL --darcs-2
cd test-darcs-2 && \
          if test -r tests_to_run; \
          then grep -v ^# tests_to_run | xargs perl ../tests/shell_harness; \
          else perl ../tests/shell_harness *.sh; \
          fi
Running add-formerly-pl.sh ...                   passed.
Running add.sh ...                               passed.
Running add_in_subdir.sh ...                     passed.
Running addexitval.sh ...                        passed.
Running addmv.sh ...                             passed.
Running addrace.sh ...                           passed.
Running addrm.sh ...                             passed.
Running amend-cancelling.sh ...                  passed.
Running amend-record.sh ...                      passed.
Running annotate.sh ...                          passed.
Running apply-hunks.sh ...                       passed.
Running ask_deps.sh ...                          passed.
Running bad-format.sh ...                        passed.
Running bad-match-pattern.sh ...                 passed.
Running bad_pending_after_pull.sh ...            passed.
Running binary.sh ...                            passed.
Running changes.sh ...                           passed.
Running changes_send_context.sh ...              passed.
Running changes_with_move.sh ...                 passed.
Running checkpoint.sh ...                        passed.
Running conflict-doppleganger.sh ...             FAILED!
Output from failed conflict-doppleganger.sh:

## The builtin ! has the wrong semantics for not.
not () { "$@" && exit 1 || :; }

# Tests for the doppleganger conflict bug.

# For Zooko, with love
# Also, for issue81.

rm -rf temp
mkdir temp
cd temp

# check that dopplegangers conflict in --old-fashioned
rm -rf tmp_dopple tmp_ganger
mkdir tmp_dopple
cd tmp_dopple
darcs init --old-fashioned

darcs show repo | grep darcs-1.0
        Format: darcs-1.0
touch a.txt
darcs add a.txt
darcs record -A base -am 'adding a.txt'
Finished recording patch 'adding a.txt'
cd ..

darcs get tmp_dopple tmp_ganger
Finished getting.

for repo in tmp_dopple tmp_ganger; do
    echo working on $repo
    cd $repo
    echo "text which appears in both places at once" > a.txt
    darcs record -A $repo -am "recording an identical change in $repo"
    cd ..
done
working on tmp_dopple
Finished recording patch 'recording an identical change in tmp_dopple'
working on tmp_ganger
No changes!

# Now that the conflict has been set up, try pull one patch from the other.
cd tmp_ganger
darcs pull -a ../tmp_dopple > out
cat out
Pulling from "c:/Documents and Settings/buildslave/windows-darcs2/zooko 
allmydata virtual2/build/test-darcs-2/temp/tmp_dopple"...
Finished pulling and applying.
grep 'conflict' out
Running conflict-fight-failure.sh ...            passed.
Running conflict-fight.sh ...                    passed.
Running diff.sh ...                              passed.
Running directory_confusion.sh ...               passed.
Running disable.sh ...                           passed.
Running dist.sh ...                              passed.
Running double-unrevert.sh ...                   passed.
Running example.sh ...                           passed.
Running external.sh ...                          passed.
Running filepath.sh ...                          passed.
Running get.sh ...                               passed.
Running get_tag.sh ...                           passed.
Running harness.sh ...                           passed.
Running hashed_inventory.sh ...                  FAILED!
Output from failed hashed_inventory.sh:

# We'd just use `diff -x _darcs -r' if -x was portable.
diffx () {
    { find $1 -type f; find $2 -type f; } |
      sed  -e '/.*\/_darcs\//d' -e 's;^[^/]*;;' | grep -v darcs.tix | sort | 
uniq |
      {
        while read part; do
            diff -c $1$part $2$part
        done
      }
}

makepristine () {
    rm -rf pristine
    mkdir pristine
    for i in `darcs show files --no-files --no-pending`; do
        echo mkdir -p pristine/$i;
        mkdir -p pristine/$i;
    done
    for i in `darcs show files --no-directories --no-pending`; do
        echo darcs show contents $i ">" pristine/$i;
        darcs show contents $i > pristine/$i;
        cat pristine/$i;
    done
}



rm -rf temp1 temp2 temp3 temp4 temp5
mkdir temp1
cd temp1
darcs init --hashed
touch foo
darcs add foo
darcs rec -m t1 -a -A tester
Finished recording patch 't1'
echo 1 >> foo
darcs what -s | grep -v No\ changes
M ./foo +1
darcs what -l | grep -v No\ changes
M ./foo +1
darcs what -sl | grep -v No\ changes
M ./foo +1
makepristine
darcs show files --no-files --no-pending
mkdir -p pristine/.
darcs show files --no-directories --no-pending
darcs show contents ./foo > pristine/./foo
cd ..

darcs get temp1 temp2
Copying patches, to get lazy repository hit ctrl-C...
Finished getting.
cd temp2
darcs changes
Thu Nov  6 13:48:22 Pacific Standard Time 2008  tester
  * t1
makepristine
darcs show files --no-files --no-pending
mkdir -p pristine/.
darcs show files --no-directories --no-pending
darcs show contents ./foo > pristine/./foo
cd ..

darcs get --hashed temp1 temp3
Copying patches, to get lazy repository hit ctrl-C...
Finished getting.
cd temp3
darcs changes
Thu Nov  6 13:48:22 Pacific Standard Time 2008  tester
  * t1
cp _darcs/hashed_inventory inv
darcs optimize
Done optimizing!
diff -c inv _darcs/hashed_inventory
rm inv
makepristine
darcs show files --no-files --no-pending
mkdir -p pristine/.
darcs show files --no-directories --no-pending
darcs show contents ./foo > pristine/./foo
cd ..
cat temp3/pristine/foo

diffx temp2 temp3
diff -rc temp1/pristine temp3/pristine
diff -rc temp2/pristine temp3/pristine

cd temp1
darcs record -a -A tester -m t2
Finished recording patch 't2'
darcs push ../temp2 -a
Finished applying...
Push successful.
darcs push ../temp3 -a
Finished applying...
Push successful.
makepristine
darcs show files --no-files --no-pending
mkdir -p pristine/.
darcs show files --no-directories --no-pending
darcs show contents ./foo > pristine/./foo
1
cd ..

cd temp3
makepristine
darcs show files --no-files --no-pending
mkdir -p pristine/.
darcs show files --no-directories --no-pending
darcs show contents ./foo > pristine/./foo
1
cd ..
cd temp2
makepristine
darcs show files --no-files --no-pending
mkdir -p pristine/.
darcs show files --no-directories --no-pending
darcs show contents ./foo > pristine/./foo
1
cd ..

diffx temp2 temp3
diff -rc temp1/pristine temp3/pristine
diff -rc temp2/pristine temp3/pristine

cd temp1
date > foo
darcs record -a -A tester -m t3
Finished recording patch 't3'
makepristine
darcs show files --no-files --no-pending
mkdir -p pristine/.
darcs show files --no-directories --no-pending
darcs show contents ./foo > pristine/./foo
Thu Nov  6 13:48:39 PST 2008
cd ../temp2
darcs pull -a
Pulling from "c:/Documents and Settings/buildslave/windows-darcs2/zooko 
allmydata virtual2/build/test-darcs-2/temp1"...
Finished pulling and applying.
makepristine
darcs show files --no-files --no-pending
mkdir -p pristine/.
darcs show files --no-directories --no-pending
darcs show contents ./foo > pristine/./foo
Thu Nov  6 13:48:39 PST 2008
cd ../temp3
darcs pull -a
Pulling from "c:/Documents and Settings/buildslave/windows-darcs2/zooko 
allmydata virtual2/build/test-darcs-2/temp1"...
Finished pulling and applying.
darcs check
The repository is consistent!
makepristine
darcs show files --no-files --no-pending
mkdir -p pristine/.
darcs show files --no-directories --no-pending
darcs show contents ./foo > pristine/./foo
Thu Nov  6 13:48:39 PST 2008
cd ..

diffx temp2 temp3
diff -rc temp1/pristine temp3/pristine
diff -rc temp2/pristine temp3/pristine

cd temp1
darcs put --hashed ../temp4
Finished applying...
Put successful.
cd ..
cd temp4
makepristine
darcs show files --no-files --no-pending
mkdir -p pristine/.
darcs show files --no-directories --no-pending
darcs show contents ./foo > pristine/./foo
Thu Nov  6 13:48:39 PST 2008
cd ..

diffx temp2 temp4
diff -rc temp2/pristine temp4/pristine

cd temp1
darcs tag -A tagger -m atag
Finished tagging patch 'TAG atag'
darcs check
The repository is consistent!
darcs optimize
Done optimizing!
darcs check
The repository is consistent!
darcs changes | grep t1
  * t1
cd ..

cd temp3
date > foobarpatch
darcs add foobarpatch
darcs record -a -A silly -m foobarpatch
Finished recording patch 'foobarpatch'
darcs check
The repository is consistent!
darcs optimize
Done optimizing!
darcs check
The repository is consistent!
darcs pull -a ../temp1
Pulling from "c:/Documents and Settings/buildslave/windows-darcs2/zooko 
allmydata virtual2/build/test-darcs-2/temp1"...
Finished pulling and applying.
darcs check
The repository is consistent!
darcs optimize --reorder-patches
Done optimizing!
darcs check
The repository is consistent!
grep 'Starting with inventory' _darcs/hashed_inventory
Starting with inventory:
cd ..

cd temp1
darcs pull -a ../temp3
Finished pulling and applying.
cd ..

diff -c temp1/_darcs/hashed_inventory temp3/_darcs/hashed_inventory

cd temp4
darcs pull -p foobarpatch -a ../temp3
Finished pulling and applying.
darcs pull -a ../temp1
Finished pulling and applying.
darcs optimize --reorder
Done optimizing!
darcs check
The repository is consistent!
darcs push ../temp1
Pushing to "c:/Documents and Settings/buildslave/windows-darcs2/zooko allmydata 
virtual2/build/test-darcs-2/temp1"...
No recorded local changes to push!
cd ..

diff temp1/_darcs/hashed_inventory temp4/_darcs/hashed_inventory

rm -rf temp3
darcs get --old-fashioned temp1 temp3
Finished getting.

rm -rf "$HOME"/.darcs/sources
echo cache:"$HOME"/.darcs/cache > "$HOME"/.darcs/sources
darcs get --hashed temp3 temp5
Finished getting.
rm -rf temp5
# check that sources directory was created:
cd "$HOME"/.darcs/sources && cd -
hashed_inventory.sh: line 158: cd: /cygdrive/c/Documents and 
Settings/buildslave/windows-darcs2/zooko allmydata 
virtual2/build/test-darcs-2/.darcs/sources: Not a directory

darcs get temp1 temp5 --hashed --old-fashioned
Copying patches, to get lazy repository hit ctrl-C...
Finished getting.
cd temp5
darcs obliterate --last 3 -a
Finished obliterating.
darcs pull ../temp1 -a
Pulling from "c:/Documents and Settings/buildslave/windows-darcs2/zooko 
allmydata virtual2/build/test-darcs-2/temp1"...
Finished pulling and applying.
darcs obliterate --last 3 -a
Finished obliterating.
darcs pull ../temp2 -a
Finished pulling and applying.
darcs check
The repository is consistent!
darcs obliterate --last 3 -a
Finished obliterating.
darcs pull ../temp3 -a
Finished pulling and applying.
darcs obliterate --last 3 -a
Finished obliterating.
darcs pull ../temp4 -a
Finished pulling and applying.
cd ..

cd temp4
darcs obliterate --last 3 -a
Finished obliterating.
darcs pull ../temp5 -a
Finished pulling and applying.
cd ..

cd temp3
darcs obliterate --last 3 -a
Finished obliterating.
darcs pull ../temp5 -a
darcs.exe: 
_darcs/patches/20081106214852-c2220-6e587a5324a1eafceea90623bcf1333e728a0392.gz:
 removeFile: permission denied (Permission denied)
Running haskell_policy.sh ...                    passed.
Running hidden_conflict.sh ...                   passed.
Running hidden_conflict2.sh ...                  passed.
Running ignore-this.sh ...                       passed.
Running ignoretimes.sh ...                       passed.
Running illegal_mv.sh ...                        passed.
Running impossible_unrevert.sh ...               passed.
Running init.sh ...                              passed.
Running invalid_pending_after_mv_to_self.sh ...  passed.
Running issue1012_unrecord_remove.sh ...         passed.
Running issue1017_whatsnew_stack.sh ...          passed.
Running issue1039.sh ...                         passed.
Running issue1041.sh ...                         passed.
Running issue1043_geteff_a.sh ...                passed.
Running issue1057.sh ...                         passed.
Running issue1078_symlink.sh ...                 passed.
Running issue1105.sh ...                         passed.
Running issue1110_get_hashed.sh ...              passed.
Running issue1110_get_old-fashioned.sh ...       passed.
Running issue1111-pull-intersection.sh ...       passed.
Running issue1139-diff-last.sh ...               passed.
Running issue1139-diff-with-no-args.sh ...       passed.
Running issue154_pull_dir_not_empty.sh ...       passed.
Running issue157_rollback_conflict.sh ...        passed.
Running issue174_obliterate_before_a_tag.sh ...  passed.
Running issue184_add.sh ...                      passed.
Running issue194.sh ...                          passed.
Running issue244_changes.sh ...                  passed.
Running issue257.sh ...                          passed.
Running issue279_get_extra.sh ...                passed.
Running issue381.sh ...                          passed.
Running issue436.sh ...                          passed.
Running issue458.sh ...                          passed.
Running issue53.sh ...                           passed.
Running issue538.sh ...                          passed.
Running issue588.sh ...                          passed.
Running issue595_get_permissions.sh ...          passed.
Running issue612_repo_not_writeable.sh ...       passed.
Running issue691.sh ...                          passed.
Running issue706.sh ...                          passed.
Running issue709_pending_look-for-adds.sh ...    passed.
Running issue70_setpref.sh ...                   passed.
Running issue803.sh ...                          passed.
Running issue844_gzip_crc.sh ...                 FAILED!
Output from failed issue844_gzip_crc.sh:
rm -rf temp1 temp2
mkdir temp1
cd temp1
darcs init
echo > a
darcs add a
darcs record a -a -m "init"
Recording changes in "a":

Finished recording patch 'init'
cd ..

mkdir temp2
cd temp2
darcs init
darcs pull ../temp1 -a
Finished pulling and applying.
darcs optimize --compress
Optimizing (un)compression of patches...
darcs.exe: 
0000000102-3e24b8f08baa5272d7c540b3c83db7d6edf0fd26b40437983d30a238b5019a37: 
removeFile: permission denied (Permission denied)
Running issue864_replace_in_moved.sh ...         passed.
Running issue885_get_to_match.sh ...             passed.
Running issue966_diff.sh ...                     passed.
Running justrm.sh ...                            passed.
Running lazy-optimize-reorder.sh ...             passed.
Running look_for_add.sh ...                      passed.
Running mark-conflicts.sh ...                    passed.
Running match-date.sh ...                        passed.
Running match.sh ...                             passed.
Running merge_three_patches.sh ...               passed.
Running mergeresolved.sh ...                     passed.
Running merging_newlines.sh ...                  passed.
Running mv-formerly-pl.sh ...                    passed.
Running mv-test-suite.sh ...                     passed.
Running mv.sh ...                                passed.
Running mv_and_remove_tests.sh ...               passed.
Running mv_then_add.sh ...                       passed.
Running no_pristine.sh ...                       passed.
Running nodeps.sh ...                            passed.
Running nonewline.sh ...                         passed.
Running obliterate-add.sh ...                    passed.
Running obliterate-formerly-pl.sh ...            passed.
Running obliterate.sh ...                        passed.
Running optimize.sh ...                          passed.
Running optimize_relink.sh ...                   passed.
Running output.sh ...                            passed.
Running overriding-defaults.sh ...               FAILED!
Output from failed overriding-defaults.sh:

## The builtin ! has the wrong semantics for not.
not () { "$@" && exit 1 || :; }

rm -rf temp
mkdir temp
cd temp
darcs init
darcs setpref test false
Changing value of test from '' to 'false'
darcs record --no-test -a -m 'add failing test'
Finished recording patch 'add failing test'

# should pass with --no-test
darcs check --no-test
The repository is consistent!
darcs.exe: 
_darcs/pristine.hashed/0000000000-e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855:
 removeFile: permission denied (Permission denied)
Running partial.sh ...                           passed.
Running pending.sh ...                           passed.
Running pending_has_conflicts.sh ...             passed.
Running perms.sh ...                             passed.
Running posthook.sh ...                          passed.
Running prefs.sh ...                             passed.
Running prefs_binary.sh ...                      passed.
Running prehook.sh ...                           passed.
Running printer.sh ...                           passed.
Running pull-dont-prompt-deps.sh ...             passed.
Running pull-union.sh ...                        passed.
Running pull.sh ...                              passed.
Running pull_binary.sh ...                       passed.
Running pull_compl.sh ...                        passed.
Running pull_many_files.sh ...                   passed.
Running pull_two.sh ...                          passed.
Running push-dont-prompt-deps.sh ...             passed.
Running push-dry-run.sh ...                      passed.
Running push-formerly-pl.sh ...                  passed.
Running push.sh ...                              passed.
Running push_lock.sh ...                         passed.
Running put.sh ...                               passed.
Running query_manifest.sh ...                    passed.
Running record-interactive.sh ...                passed.
Running record.sh ...                            passed.
Running record_editor.sh ...                     passed.
Running recordrace.sh ...                        passed.
Running repair-clean.sh ...                      passed.
Running repair.sh ...                            passed.
Running replace.sh ...                           passed.
Running replace_after_pending_add.sh ...         passed.
Running replace_after_pending_mv.sh ...          passed.
Running repodir.sh ...                           passed.
Running repoformat.sh ...                        passed.
Running revert_interactive.sh ...                passed.
Running revert_unrecorded_add.sh ...             passed.
Running rmconflict.sh ...                        passed.
Running rmdir-formerly-pl.sh ...                 passed.
Running rmdir.sh ...                             passed.
Running rollback-nothing.sh ...                  passed.
Running rollback.sh ...                          passed.
Running sametwice.sh ...                         passed.
Running send-dont-prompt-deps.sh ...             passed.
Running send-external.sh ...                     passed.
Running send.sh ...                              passed.
Running send_apply.sh ...                        passed.
Running set_scripts_executable.sh ...            passed.
Running setpref.sh ...                           passed.
Running several_commands.sh ...                  passed.
Running show-authors.sh ...                      passed.
Running show-bug.sh ...                          passed.
Running show_contents.sh ...                     passed.
Running show_tags.sh ...                         passed.
Running sigPIPE.sh ...                           passed.
Running ssh.sh ...                               passed.
Running steve_and_monica_rollback.sh ...         passed.
Running tag.sh ...                               passed.
Running three_way_conflict.sh ...                passed.
Running time-stamps.sh ...                       FAILED!
Output from failed time-stamps.sh:

not () { "$@" && exit 1 || :; }

rm -rf temp
mkdir temp
cd temp
darcs init --hashed

echo this is my favorite test > foobar
darcs add foobar
sleep 2 # so the time stamps won't accidentally be identical
darcs record -am 'add foobar'
Finished recording patch 'add foobar'

HASHVAL=0000000025-4cbbfd8ce543076b132b13b60ae06d0189ee80b4d5908abb5e060d331d25eb5c

if test -d _darcs/pristine.hashed;
then
  ls _darcs/pristine.hashed
  test -f _darcs/pristine.hashed/$HASHVAL
  # verify that the modification time of the file in the pristine cache
  # is identical to the modification time of the file in the working
  # directory.
  not test foobar -ot _darcs/pristine.hashed/$HASHVAL
  not test foobar -nt _darcs/pristine.hashed/$HASHVAL
else
  not test foobar -ot _darcs/pristine/foobar
  not test foobar -nt _darcs/pristine/foobar
fi
0000000025-4cbbfd8ce543076b132b13b60ae06d0189ee80b4d5908abb5e060d331d25eb5c
0000000089-79de6fe304d2a19bf5279423b359afe9f74c1e7c42753fac061f95631c7f8372
da39a3ee5e6b4b0d3255bfef95601890afd80709
Running toolbox.sh ...                           passed.
Running tricky_unrecord.sh ...                   passed.
Running uniqueoptions.sh ...                     passed.
Running unpull-formerly-pl.sh ...                passed.
Running unpull.sh ...                            passed.
Running unrecord-add.sh ...                      passed.
Running unrecord-dont-prompt.sh ...              passed.
Running unrecord-remove.sh ...                   passed.
Running unrecord-setpref.sh ...                  passed.
Running unrecord.sh ...                          passed.
Running unrevert-add.sh ...                      passed.
Running unrevert-replace-moved.sh ...            passed.
Running unrevert.sh ...                          passed.
Running unrevert_cancel.sh ...                   passed.
Running what_sl.sh ...                           passed.
Running whatsnew-file.sh ...                     passed.
Running whatsnew.sh ...                          passed.
Running workingdir.sh ...                        passed.
TESTS FAILED!
        conflict-doppleganger.sh
        hashed_inventory.sh
        issue844_gzip_crc.sh
        overriding-defaults.sh
        time-stamps.sh
make: *** [test-darcs-2] Error 1
[ghc] hspwd
[1 of 1] Compiling Main             ( tests/hspwd.hs, tests/hspwd.o )
Linking hspwd.exe ...
Applying functional tests to darcs-2 repositories...
test ! -e test-darcs-2 || chmod -R u+rwx test-darcs-2
rm -rf test-darcs-2
cp -R tests test-darcs-2
mkdir -p test-darcs-2/.darcs
echo >>test-darcs-2/.darcs/defaults ALL --darcs-2
cd test-darcs-2 && \
          if test -r tests_to_run; \
          then grep -v ^# tests_to_run | xargs perl ../tests/shell_harness; \
          else perl ../tests/shell_harness *.sh; \
          fi
Running add-formerly-pl.sh ...                   passed.
Running add.sh ...                               passed.
Running add_in_subdir.sh ...                     passed.
Running addexitval.sh ...                        passed.
Running addmv.sh ...                             passed.
Running addrace.sh ...                           passed.
Running addrm.sh ...                             passed.
Running amend-cancelling.sh ...                  passed.
Running amend-record.sh ...                      passed.
Running annotate.sh ...                          passed.
Running apply-hunks.sh ...                       passed.
Running ask_deps.sh ...                          passed.
Running bad-format.sh ...                        passed.
Running bad-match-pattern.sh ...                 passed.
Running bad_pending_after_pull.sh ...            passed.
Running binary.sh ...                            passed.
Running changes.sh ...                           passed.
Running changes_send_context.sh ...              passed.
Running changes_with_move.sh ...                 passed.
Running checkpoint.sh ...                        passed.
Running conflict-doppleganger.sh ...             FAILED!
Output from failed conflict-doppleganger.sh:

## The builtin ! has the wrong semantics for not.
not () { "$@" && exit 1 || :; }

# Tests for the doppleganger conflict bug.

# For Zooko, with love
# Also, for issue81.

rm -rf temp
mkdir temp
cd temp

# check that dopplegangers conflict in --old-fashioned
rm -rf tmp_dopple tmp_ganger
mkdir tmp_dopple
cd tmp_dopple
darcs init --old-fashioned

darcs show repo | grep darcs-1.0
        Format: darcs-1.0
touch a.txt
darcs add a.txt
darcs record -A base -am 'adding a.txt'
Finished recording patch 'adding a.txt'
cd ..

darcs get tmp_dopple tmp_ganger
Finished getting.

for repo in tmp_dopple tmp_ganger; do
    echo working on $repo
    cd $repo
    echo "text which appears in both places at once" > a.txt
    darcs record -A $repo -am "recording an identical change in $repo"
    cd ..
done
working on tmp_dopple
Finished recording patch 'recording an identical change in tmp_dopple'
working on tmp_ganger
No changes!

# Now that the conflict has been set up, try pull one patch from the other.
cd tmp_ganger
darcs pull -a ../tmp_dopple > out
cat out
Pulling from "c:/Documents and Settings/buildslave/windows-darcs2/zooko 
allmydata virtual2/build/test-darcs-2/temp/tmp_dopple"...
Finished pulling and applying.
grep 'conflict' out
Running conflict-fight-failure.sh ...            passed.
Running conflict-fight.sh ...                    passed.
Running diff.sh ...                              passed.
Running directory_confusion.sh ...               passed.
Running disable.sh ...                           passed.
Running dist.sh ...                              passed.
Running double-unrevert.sh ...                   passed.
Running example.sh ...                           passed.
Running external.sh ...                          passed.
Running filepath.sh ...                          passed.
Running get.sh ...                               passed.
Running get_tag.sh ...                           passed.
Running harness.sh ...                           passed.
Running hashed_inventory.sh ...                  passed.
Running haskell_policy.sh ...                    passed.
Running hidden_conflict.sh ...                   passed.
Running hidden_conflict2.sh ...                  passed.
Running ignore-this.sh ...                       passed.
Running ignoretimes.sh ...                       passed.
Running illegal_mv.sh ...                        passed.
Running impossible_unrevert.sh ...               passed.
Running init.sh ...                              passed.
Running invalid_pending_after_mv_to_self.sh ...  passed.
Running issue1012_unrecord_remove.sh ...         passed.
Running issue1017_whatsnew_stack.sh ...          passed.
Running issue1039.sh ...                         passed.
Running issue1041.sh ...                         passed.
Running issue1043_geteff_a.sh ...                passed.
Running issue1057.sh ...                         passed.
Running issue1078_symlink.sh ...                 passed.
Running issue1105.sh ...                         passed.
Running issue1110_get_hashed.sh ...              passed.
Running issue1110_get_old-fashioned.sh ...       passed.
Running issue1111-pull-intersection.sh ...       passed.
Running issue1139-diff-last.sh ...               passed.
Running issue1139-diff-with-no-args.sh ...       passed.
Running issue154_pull_dir_not_empty.sh ...       passed.
Running issue157_rollback_conflict.sh ...        passed.
Running issue174_obliterate_before_a_tag.sh ...  passed.
Running issue184_add.sh ...                      passed.
Running issue194.sh ...                          passed.
Running issue244_changes.sh ...                  passed.
Running issue257.sh ...                          passed.
Running issue279_get_extra.sh ...                passed.
Running issue381.sh ...                          passed.
Running issue436.sh ...                          passed.
Running issue458.sh ...                          passed.
Running issue53.sh ...                           passed.
Running issue538.sh ...                          passed.
Running issue588.sh ...                          passed.
Running issue595_get_permissions.sh ...          passed.
Running issue612_repo_not_writeable.sh ...       passed.
Running issue691.sh ...                          passed.
Running issue706.sh ...                          passed.
Running issue709_pending_look-for-adds.sh ...    passed.
Running issue70_setpref.sh ...                   passed.
Running issue803.sh ...                          passed.
Running issue844_gzip_crc.sh ...                 passed.
Running issue864_replace_in_moved.sh ...         passed.
Running issue885_get_to_match.sh ...             passed.
Running issue966_diff.sh ...                     passed.
Running justrm.sh ...                            passed.
Running lazy-optimize-reorder.sh ...             passed.
Running look_for_add.sh ...                      passed.
Running mark-conflicts.sh ...                    passed.
Running match-date.sh ...                        passed.
Running match.sh ...                             passed.
Running merge_three_patches.sh ...               passed.
Running mergeresolved.sh ...                     passed.
Running merging_newlines.sh ...                  passed.
Running mv-formerly-pl.sh ...                    passed.
Running mv-test-suite.sh ...                     passed.
Running mv.sh ...                                passed.
Running mv_and_remove_tests.sh ...               passed.
Running mv_then_add.sh ...                       passed.
Running no_pristine.sh ...                       passed.
Running nodeps.sh ...                            passed.
Running nonewline.sh ...                         passed.
Running obliterate-add.sh ...                    passed.
Running obliterate-formerly-pl.sh ...            passed.
Running obliterate.sh ...                        passed.
Running optimize.sh ...                          passed.
Running optimize_relink.sh ...                   passed.
Running output.sh ...                            passed.
Running overriding-defaults.sh ...               FAILED!
Output from failed overriding-defaults.sh:

## The builtin ! has the wrong semantics for not.
not () { "$@" && exit 1 || :; }

rm -rf temp
mkdir temp
cd temp
darcs init
darcs setpref test false
Changing value of test from '' to 'false'
darcs record --no-test -a -m 'add failing test'
Finished recording patch 'add failing test'

# should pass with --no-test
darcs check --no-test
The repository is consistent!

# should fail when test is run
not darcs check --test
The repository is consistent!
Running test...

Test failed!


# should pass with --no-test in defaults
echo check --no-test > _darcs/prefs/defaults
darcs check
The repository is consistent!
not darcs check --test
The repository is consistent!
Running test...

Test failed!


# should fail with --test in defaults
echo check --test > _darcs/prefs/defaults
not darcs check
The repository is consistent!
Running test...

Test failed!

darcs check --no-test
The repository is consistent!

# check global defaults
cp ~/.darcs/defaults defaults.backup
rm _darcs/prefs/defaults

# --no-test works in global defaults
echo check --no-test > ~/.darcs/defaults
darcs check
The repository is consistent!
not darcs check --test
The repository is consistent!
Running test...

Test failed!


# --test works in global defaults
echo check --test > ~/.darcs/defaults
not darcs check
The repository is consistent!
Running partial.sh ...                           passed.
Running pending.sh ...                           passed.
Running pending_has_conflicts.sh ...             passed.
Running perms.sh ...                             passed.
Running posthook.sh ...                          passed.
Running prefs.sh ...                             passed.
Running prefs_binary.sh ...                      passed.
Running prehook.sh ...                           passed.
Running printer.sh ...                           passed.
Running pull-dont-prompt-deps.sh ...             passed.
Running pull-union.sh ...                        passed.
Running pull.sh ...                              passed.
Running pull_binary.sh ...                       passed.
Running pull_compl.sh ...                        passed.
Running pull_many_files.sh ...                   FAILED!
Output from failed pull_many_files.sh:

rm -rf temp1 temp2

if grep old-fashioned .darcs/defaults; then
format=old-fashioned-inventory
elif grep darcs-2 .darcs/defaults; then
format=darcs-2
else format=hashed; fi

mkdir temp2
cd temp2
gunzip -c ../repos/many-files--${format}.tgz | tar xf -
cd ..

mkdir temp1
cd temp1
darcs init
darcs pull -a ../temp2/many-files--${format} > log

darcs failed:  Incompatibility with repository c:/Documents and 
Settings/buildslave/windows-darcs2/zooko allmydata 
virtual2/build/test-darcs-2/temp2/many-files--hashed:
Cannot mix darcs-2 repositories with older formats
Running pull_two.sh ...                          passed.
Running push-dont-prompt-deps.sh ...             passed.
Running push-dry-run.sh ...                      passed.
Running push-formerly-pl.sh ...                  passed.
Running push.sh ...                              passed.
Running push_lock.sh ...                         passed.
Running put.sh ...                               passed.
Running query_manifest.sh ...                    passed.
Running record-interactive.sh ...                passed.
Running record.sh ...                            passed.
Running record_editor.sh ...                     passed.
Running recordrace.sh ...                        passed.
Running repair-clean.sh ...                      passed.
Running repair.sh ...                            passed.
Running replace.sh ...                           passed.
Running replace_after_pending_add.sh ...         passed.
Running replace_after_pending_mv.sh ...          passed.
Running repodir.sh ...                           passed.
Running repoformat.sh ...                        passed.
Running revert_interactive.sh ...                passed.
Running revert_unrecorded_add.sh ...             passed.
Running rmconflict.sh ...                        passed.
Running rmdir-formerly-pl.sh ...                 passed.
Running rmdir.sh ...                             passed.
Running rollback-nothing.sh ...                  passed.
Running rollback.sh ...                          passed.
Running sametwice.sh ...                         passed.
Running send-dont-prompt-deps.sh ...             passed.
Running send-external.sh ...                     passed.
Running send.sh ...                              passed.
Running send_apply.sh ...                        passed.
Running set_scripts_executable.sh ...            passed.
Running setpref.sh ...                           passed.
Running several_commands.sh ...                  passed.
Running show-authors.sh ...                      passed.
Running show-bug.sh ...                          passed.
Running show_contents.sh ...                     passed.
Running show_tags.sh ...                         passed.
Running sigPIPE.sh ...                           passed.
Running ssh.sh ...                               passed.
Running steve_and_monica_rollback.sh ...         passed.
Running tag.sh ...                               passed.
Running three_way_conflict.sh ...                passed.
Running time-stamps.sh ...                       FAILED!
Output from failed time-stamps.sh:

not () { "$@" && exit 1 || :; }

rm -rf temp
mkdir temp
cd temp
darcs init --hashed

echo this is my favorite test > foobar
darcs add foobar
sleep 2 # so the time stamps won't accidentally be identical
darcs record -am 'add foobar'
Finished recording patch 'add foobar'

HASHVAL=0000000025-4cbbfd8ce543076b132b13b60ae06d0189ee80b4d5908abb5e060d331d25eb5c

if test -d _darcs/pristine.hashed;
then
  ls _darcs/pristine.hashed
  test -f _darcs/pristine.hashed/$HASHVAL
  # verify that the modification time of the file in the pristine cache
  # is identical to the modification time of the file in the working
  # directory.
  not test foobar -ot _darcs/pristine.hashed/$HASHVAL
  not test foobar -nt _darcs/pristine.hashed/$HASHVAL
else
  not test foobar -ot _darcs/pristine/foobar
  not test foobar -nt _darcs/pristine/foobar
fi
0000000025-4cbbfd8ce543076b132b13b60ae06d0189ee80b4d5908abb5e060d331d25eb5c
0000000089-79de6fe304d2a19bf5279423b359afe9f74c1e7c42753fac061f95631c7f8372
da39a3ee5e6b4b0d3255bfef95601890afd80709
Running toolbox.sh ...                           passed.
Running tricky_unrecord.sh ...                   passed.
Running uniqueoptions.sh ...                     passed.
Running unpull-formerly-pl.sh ...                passed.
Running unpull.sh ...                            passed.
Running unrecord-add.sh ...                      passed.
Running unrecord-dont-prompt.sh ...              passed.
Running unrecord-remove.sh ...                   passed.
Running unrecord-setpref.sh ...                  passed.
Running unrecord.sh ...                          passed.
Running unrevert-add.sh ...                      passed.
Running unrevert-replace-moved.sh ...            passed.
Running unrevert.sh ...                          passed.
Running unrevert_cancel.sh ...                   passed.
Running what_sl.sh ...                           passed.
Running whatsnew-file.sh ...                     passed.
Running whatsnew.sh ...                          passed.
Running workingdir.sh ...                        passed.
TESTS FAILED!
        conflict-doppleganger.sh
        overriding-defaults.sh
        pull_many_files.sh
        time-stamps.sh
make: *** [test-darcs-2] Error 1

Attachment: signature.asc
Description: Digital signature

_______________________________________________
darcs-users mailing list
[email protected]
http://lists.osuosl.org/mailman/listinfo/darcs-users

Reply via email to