Tue Jan 1 19:22:35 EST 2008 Mark Stosberg <[EMAIL PROTECTED]>
* Make sure we test the 'darcs' we just built and not one in a global path.
This done by using "$DARCS" instead of 'darcs'.
However, in my case the updated test FAILS unexplainably with 2.0.0pre3,
by failing to detect that a file has changed.
If I follow along in a shell and run the same commands with Darcs 2,
the problem does not appear.
New patches:
[Make sure we test the 'darcs' we just built and not one in a global path.
Mark Stosberg <[EMAIL PROTECTED]>**20080102002235
This done by using "$DARCS" instead of 'darcs'.
However, in my case the updated test FAILS unexplainably with 2.0.0pre3,
by failing to detect that a file has changed.
If I follow along in a shell and run the same commands with Darcs 2,
the problem does not appear.
] {
hunk ./tests/merging_newlines.pl 7
-use Test::More tests => 6;
+use Test::More 'no_plan';
hunk ./tests/merging_newlines.pl 9
-use vars qw/$DARCS/;
+use vars '$DARCS';
hunk ./tests/merging_newlines.pl 14
+diag "reality check: ".`$DARCS --version`;
+
hunk ./tests/merging_newlines.pl 41
-chdir "tmp2/";
hunk ./tests/merging_newlines.pl 42
-open(T2,">>one.txt");
-print T2 "in tmp2\n";
-close(T2);
+chdir "tmp2/" || die "couldn't chdir: $!";
+
+like(`$DARCS query manifest`, qr/one.txt/, "reality check: manifest");
+
+open(T2,">>one.txt") || die "failed to open one.txt: $!";
+print T2 "in tmp2\n" || die "failed to print: $!";
+close(T2) || die "failed to close: $!";
+
+like(`$DARCS w -s`, qr/M/, "reality check: darcs w -s");
hunk ./tests/merging_newlines.pl 52
-`darcs rec -A bar -am "add extra line"`;
+my $out = `$DARCS rec -A bar -am "add extra line"`;
hunk ./tests/merging_newlines.pl 54
-like(`darcs push -a`,qr/conflicts/i,'expect conflicts when pushing');
+like(`$DARCS push -a` ,qr/conflicts/i,'expect conflicts when pushing');
hunk ./tests/merging_newlines.pl 59
- unlike(`darcs resolve`,qr/no conflicts/i, "after a conflict, darcs resolve should report a conflict");
+ unlike(`$DARCS resolve`,qr/no conflicts/i, "after a conflict, darcs resolve should report a conflict");
hunk ./tests/merging_newlines.pl 65
- #rm_rf($dir);
}
Context:
[simplify (and debug) pending handling.
David Roundy <[EMAIL PROTECTED]>**20071227133618
Note that this change could lead to performance regressions, but I believe
that these regressions would be strongly bounded (never worse than a
whatsnew), and this simplification makes the code much easier to safely
modify.
]
[make updating of pending on pull much more efficient.
David Roundy <[EMAIL PROTECTED]>**20071224131059]
[simplify a bit of code.
David Roundy <[EMAIL PROTECTED]>**20071224131023]
[fix type-witness bug in HopefullyPrivate.
David Roundy <[EMAIL PROTECTED]>**20071223141149]
[simplify Get
David Roundy <[EMAIL PROTECTED]>**20071223025108]
[simplify tentativelyAddPatch by removing unused return value.
David Roundy <[EMAIL PROTECTED]>**20071223024400]
[simplify away np2prims and nps2prims.
David Roundy <[EMAIL PROTECTED]>**20071223022145]
[try to avoid rewriting patches that we've just read.
David Roundy <[EMAIL PROTECTED]>**20071222190029]
[generalize CommandsAux utility functions.
David Roundy <[EMAIL PROTECTED]>**20071222162952]
[add new instances for PatchInfoAnd.
David Roundy <[EMAIL PROTECTED]>**20071222144439]
[change tentativelyAddPatch to accept a PatchInfoAnd p.
David Roundy <[EMAIL PROTECTED]>**20071222140517]
[internal prepration for optimization saving patch writing.
David Roundy <[EMAIL PROTECTED]>**20071222134834]
[add changelog entry.
David Roundy <[EMAIL PROTECTED]>**20071219162646]
[add fixme indicating where the code could be simplified.
David Roundy <[EMAIL PROTECTED]>**20071221135649]
[make reading of hashed inventories lazier.
David Roundy <[EMAIL PROTECTED]>**20071221133453]
[resolve conflicts in mv_and_remove_tests.sh.
David Roundy <[EMAIL PROTECTED]>**20071219144638]
[Fix !(...|...) in mv_and_remove_tests.sh.
Dave Love <[EMAIL PROTECTED]>**20071218001826
Assume the original construct should have been `! ... | ...' and
replace with a portable version of that.
]
[[issue571] Redo last HAVE_TERMIO_H fix.
Dave Love <[EMAIL PROTECTED]>**20071218140508
Not the most direct fix, but simpler.
]
[Fix configure test for gadt type witnesses.
Dave Love <[EMAIL PROTECTED]>**20071218120139]
[use --ignore-times in all tests.
David Roundy <[EMAIL PROTECTED]>**20071217225159
This is because the hashed repository is a bit pickier, in that
it no longer checks file lengths when the file modification times
match.
]
[enable modification time checking on hashed repositories.
David Roundy <[EMAIL PROTECTED]>**20071217220237]
[Pass two args to `cmp' in tests, following POSIX.
Dave Love <[EMAIL PROTECTED]>**20071216180503
Fixes some failures on Solaris.
]
[resolve silly conflict with myself.
David Roundy <[EMAIL PROTECTED]>**20071217200855]
[clean up SelectChanges (eliminating Bools)
David Roundy <[EMAIL PROTECTED]>**20071217191809]
[make a few more files compile with type witnesses.
David Roundy <[EMAIL PROTECTED]>**20071217183234]
[fix bug in revert (in writing the unrevert file).
David Roundy <[EMAIL PROTECTED]>**20071216215225]
[make a few more files compile with type witnesses.
David Roundy <[EMAIL PROTECTED]>**20071217164815]
[remove tabs.
David Roundy <[EMAIL PROTECTED]>**20071216224617]
[bump version number preemptively to 2.0.0pre3.
David Roundy <[EMAIL PROTECTED]>**20071216222823]
[fix doc bug in show contents.
David Roundy <[EMAIL PROTECTED]>**20071216214002]
[TAG 2.0.0pre2
David Roundy <[EMAIL PROTECTED]>**20071216201647]
Patch bundle hash:
25ad54fa8c763715ecd4430c572a859def029d83
_______________________________________________
darcs-devel mailing list
darcs-devel@darcs.net
http://lists.osuosl.org/mailman/listinfo/darcs-devel
