tests/test-hgignore.out
author Steve Borho <steve@borho.org>
Fri, 17 Sep 2010 12:44:35 -0500
branchstable
changeset 12317 ed639917c825
parent 6479 31abcae33b4f
permissions -rw-r--r--
test-eol-update: record new results as correct Changeset 0852da25a31b changed the result of this test. The 'hg update 0' command, which causes a merge of modified a.txt, now leaves a.txt in the EOLN format specified by .hgeol as it was committed in revision 0. Previously, it used the .hgeol contents from the working directory before the update.

% should display baz only
? baz
--
A dir/b.o
? a.c
? a.o
? dir/c.o
? syntax
--
abort: .hgignore: invalid pattern (relre): *.o
--
A dir/b.o
? .hgignore
? a.c
? syntax
--
A dir/b.o
? a.c
? a.o
? dir/c.o
? syntax
--
A dir/b.o
? .hgignore
? a.c
? syntax
--
A dir/b.o
? .hgignore
? a.c
? syntax
--
A dir/b.o
? .hgignore
? a.c
? syntax
--
.hgignore: ignoring invalid syntax 'invalid'
A dir/b.o
? .hgignore
? a.c
? a.o
? dir/c.o
? syntax
--
A dir/b.o
? .hgignore
? a.c
? syntax
--
A dir/b.o
? .hgignore
? a.c
? a.o
? dir/c.o
--
A dir/b.o
--
A b.o