On Sat, Oct 4, 2008 at 4:23 PM, Eric Kow <[EMAIL PROTECTED]> wrote: > This is an amended version of an earlier bundle with similar > patches. > > Note that we only have 6 Perl tests left to translate! > > I'm not sure if the merging_newlines stuff below really is > a bug, but better safe than sorry.
No, I'm pretty certain it's not a bug. When darcs doesn't do what you expect, that isn't in itself a bug. In this case, there are two newlines after your previous line, and darcs has the freedom to decide which of those is the new one. It decides in such a way that there isn't a conflict. I expect I'll apply most of these without review (on the principle that I'm lazy and busy, and no one wants to review tests). David > Sat Oct 4 14:57:24 BST 2008 Eric Kow <[EMAIL PROTECTED]> > * Move merging_newlines test to bugs and add a simpler version. > > There are two issues I noticed when converting this Perl test into > shell. This test was passing, but I made some mistakes translating it, > and in doing so, noticed two potential bugs. > > The first is a potentially hidden conflict. If we start from > a file > from temp1 > <EOF> > And then it seems that a change which adds an empty line should > conflict with a change that adds a line with content. > > The second is that if you do omit the newline, as the original > test does, > from temp1<EOF> > you get some strange-looking changes, namely that appending a > line to this yields two addline changes and not one. > > Sat Oct 4 15:54:45 BST 2008 Eric Kow <[EMAIL PROTECTED]> > * Move non-date-matching code out of match.pl > The goal is to minimise and eventually eliminate our use of Perl > for regression tests. > > Sat Oct 4 17:38:50 BST 2008 Eric Kow <[EMAIL PROTECTED]> > * Translate some more Perl tests into shell. > Shell equivalents already exist for these particular tests, > but they may not do the same thing. > > Sat Oct 4 21:16:32 BST 2008 Eric Kow <[EMAIL PROTECTED]> > * Translate some more Perl tests into shell. > > Sat Oct 4 21:21:39 BST 2008 Eric Kow <[EMAIL PROTECTED]> > * Add a toolbox.sh to tests > Like template.sh, this is not a real test, but just helper > code for writing tests. The toolbox just provides a single > place you can go to look up how to do things. > > _______________________________________________ darcs-users mailing list [email protected] http://lists.osuosl.org/mailman/listinfo/darcs-users
