Mercurial > hg
view tests/test-locate.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 | 041363739ca8 |
children | 8e947b0e53cc |
line wrap: on
line source
adding a adding b adding t.h adding t/x a NONEXISTENT: No such file or directory a b t.h t/x a: No such file or directory NONEXISTENT: No such file or directory b t.h t/x a NONEXISTENT: No such file in rev ce18e5bc5cd3 a t/x b t.h % -I/-X with relative path should work b t.h t/x t/x t/x