Mercurial > hg
annotate tests/test-encode.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 | b2ae81a7df29 |
children | f5b00b6e426a |
rev | line source |
---|---|
1258 | 1 %% no changes |
2 %% no changes | |
3 %% uncompressed contents in repo | |
4 this is a test | |
5 %% uncompress our working dir copy | |
6 this is a test | |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1258
diff
changeset
|
7 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1258 | 8 %% uncompress our new working dir copy |
9 this is a test |