Wed Oct 12 15:43:04 EST 2005 Mark Stosberg <[EMAIL PROTECTED]>
* add files starting with ".*" to default boring list. Dreamweaver uses these.
Wed Nov 23 19:11:49 EST 2005 me
* newdir
Wed Nov 23 19:13:27 EST 2005 me
* newdir
Wed Nov 23 19:18:19 EST 2005 me
* newdir
Wed Nov 23 19:20:13 EST 2005 me
* newdir
Wed Nov 23 19:36:20 EST 2005 Mark Stosberg <[EMAIL PROTECTED]>
* new TODO test for better message on directory conflict when pulling
New patches:
[add files starting with ".*" to default boring list. Dreamweaver uses these.
Mark Stosberg <[EMAIL PROTECTED]>**20051012204304]
<
> {
hunk ./RepoPrefs.lhs 117
"# be Korean translations rather than kernel modules.",
"# \\.ko$",
"\\.ko\\.cmd$","\\.mod\\.c$",
+ "(^|/)\\._",
"(^|/)\\.tmp_versions($|/)","(^|/)CVS($|/)","(^|/)RCS($|/)","~$",
"#(^|/)\\.[^/]","(^|/)_darcs($|/)",
"\\.bak$","\\.BAK$","\\.orig$","(^|/)vssver\\.scc$",
}
[newdir
me**20051124001149]
<
> {
addfile ./t.tmp
hunk ./tests/pull.pl 129
ok(!(system "diff baz correct_baz"), 'pull was right');
chdir '..';
}
+
+CREATE_DIR_ERROR: {
+ my $test_name = "when a patch creating a directory is attempted to be applied
+ when an existing directory, exists, an error is reported.";
+ mkdir 'temp1/newdir';
+ chdir 'templ';
+ darcs 'add newdir';
+ darcs 'record --ignore-times -am newdir --author me';
+ chdir '../temp2';
+ mkdir 'newdir';
+ my $out = darcs('pull -a');
+ like($out, qr/fail/i, $test_name);
+ like($out, qr/newdir/i, "...and report the name if the directory involved");
+ chdir '..';
+}
ok(-d 'temp1', "temp1 exists here");
`rm -rf temp1`;
}
[newdir
me**20051124001327]
<
> {
adddir ./tests/newdir
hunk ./tests/pull.pl 142
my $out = darcs('pull -a');
like($out, qr/fail/i, $test_name);
like($out, qr/newdir/i, "...and report the name if the directory involved");
- chdir '..';
+ chdir '../';
}
ok(-d 'temp1', "temp1 exists here");
hunk ./tests/pull.pl 146
-`rm -rf temp1`;
+rmtree('temp1');
ok((!-d 'temp1'), 'temp1 directory was deleted');
ok(-d 'temp2', "temp1 exists here");
hunk ./tests/pull.pl 150
-`rm -rf temp2`;
+rmtree('temp2');
ok((!-d 'temp2'), 'temp1 directory was deleted');
}
[newdir
me**20051124001819]
<
> {
hunk ./tests/pull.pl 137
chdir 'templ';
darcs 'add newdir';
darcs 'record --ignore-times -am newdir --author me';
- chdir '../temp2';
+ ok((chdir '../temp2'), "chdir succeeds");;
mkdir 'newdir';
my $out = darcs('pull -a');
like($out, qr/fail/i, $test_name);
hunk ./tests/pull.pl 142
like($out, qr/newdir/i, "...and report the name if the directory involved");
- chdir '../';
+ ok((chdir '../'), "chdir succeeds");;
}
ok(-d 'temp1', "temp1 exists here");
}
[newdir
me**20051124002013]
<
> {
hunk ./tests/pull.pl 145
ok((chdir '../'), "chdir succeeds");;
}
-ok(-d 'temp1', "temp1 exists here");
+ok(-d 'temp1', "temp1 exists here") || `ls -l`;
rmtree('temp1');
ok((!-d 'temp1'), 'temp1 directory was deleted');
hunk ./tests/pull.pl 149
-ok(-d 'temp2', "temp1 exists here");
+ok(-d 'temp2', "temp2 exists here");
rmtree('temp2');
hunk ./tests/pull.pl 151
-ok((!-d 'temp2'), 'temp1 directory was deleted');
+ok((!-d 'temp2'), 'temp2 directory was deleted');
}
[new TODO test for better message on directory conflict when pulling
Mark Stosberg <[EMAIL PROTECTED]>**20051124003620]
<
> {
hunk ./tests/pull.pl 131
}
CREATE_DIR_ERROR: {
+ local $TODO = 'awaiting attention from a Haskell coder.';
my $test_name = "when a patch creating a directory is attempted to be applied
when an existing directory, exists, an error is reported.";
mkdir 'temp1/newdir';
hunk ./tests/pull.pl 135
- chdir 'templ';
+ chdir 'templ/';
+ ok((chdir 'temp1/'), "chdir succeeds");;
darcs 'add newdir';
darcs 'record --ignore-times -am newdir --author me';
ok((chdir '../temp2'), "chdir succeeds");;
hunk ./tests/pull.pl 141
mkdir 'newdir';
- my $out = darcs('pull -a');
+ my $out = darcs('pull -a ../temp1');
like($out, qr/fail/i, $test_name);
like($out, qr/newdir/i, "...and report the name if the directory involved");
ok((chdir '../'), "chdir succeeds");;
}
Context:
[remove tabs from darcs source file
Tommy Pettersson <[EMAIL PROTECTED]>**20051120200002]
[Added a test for changes --context patch selection.
Daniel Bünzli <[EMAIL PROTECTED]>**20051120170157]
[Emacs ediff-merge example and explanation of --external-merge.
Dave Love <[EMAIL PROTECTED]>**20051117154924]
[Fix patch selection for command changes --context
Daniel Bünzli <[EMAIL PROTECTED]>**20051117145112]
[fix bug in amInRepository.
David Roundy <[EMAIL PROTECTED]>**20051117131208
This is the bug that causes issue9. I'm a bit uncertain about this
patch--it looks obvious, but this is pretty subtle code.
]
[fix bug where darcs tries to delete open tempfile on win32
Will <[EMAIL PROTECTED]>**20051117023516]
[bump version to 1.0.5rc1
Tommy Pettersson <[EMAIL PROTECTED]>**20051117111128]
[Fixed documentation of DARCS_GET_HTTP with curl.
Daniel Bünzli <[EMAIL PROTECTED]>**20051117062547]
[add --dont-edit-description opposite to --edit-description.
David Roundy <[EMAIL PROTECTED]>**20051116115632]
[Flag superfluous input using Test::Builder
Florian Weimer <[EMAIL PROTECTED]>**20051112160533
This change makes sure that the test case that triggers this error
condition fails in a clean way (especially if test planning is not used,
but it should work with plans as well).
]
[English and markup fixes.
Dave Love <[EMAIL PROTECTED]>**20051114224845]
[update web page to reflect 1.0.4 as latest stable source.
David Roundy <[EMAIL PROTECTED]>**20051113210144]
[TAG 1.0.4
David Roundy <[EMAIL PROTECTED]>**20051113134431]
Patch bundle hash:
8881f7128095aaf5a923bb63ea5d6c3b23ca62a4
_______________________________________________
darcs-devel mailing list
[email protected]
http://www.abridgegame.org/cgi-bin/mailman/listinfo/darcs-devel
