Mercurial > hg
view tests/test-hgignore.out @ 4416:bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
We make better use of contexts to accurately identify copies that
don't need merges.
Add a simple test and update other tests.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 08 May 2007 02:59:13 -0500 |
parents | 0d36e3d7e2ea |
children | 4e521a3ee5eb |
line wrap: on
line source
-- 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 -- .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