Mercurial > hg
annotate tests/test-merge-types.out @ 6899:56a7a54e074f
store: simplify walking
- fold in main walking function
- eliminate recursion (especially recursive yielding!)
- eliminate default args
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Wed, 13 Aug 2008 20:18:43 -0500 |
| parents | 4b0c9c674707 |
| children | 8dca507e56ce |
| rev | line source |
|---|---|
| 5710 | 1 adding a |
| 2 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
5710
diff
changeset
|
3 created new head |
| 5710 | 4 resolving manifests |
| 5 overwrite None partial False | |
| 6 ancestor c334dc3be0da local 521a1e40188f+ remote 3574f3e69b1c | |
| 7 searching for copies back to rev 1 | |
| 8 a: update permissions -> e | |
| 9 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 10 (branch merge, don't forget to commit) | |
| 11 % symlink is local parent, executable is other | |
| 12 a has no flags (default for conflicts) | |
| 13 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 14 resolving manifests | |
| 15 overwrite None partial False | |
| 16 ancestor c334dc3be0da local 3574f3e69b1c+ remote 521a1e40188f | |
| 17 searching for copies back to rev 1 | |
| 18 a: remote is newer -> g | |
| 19 getting a | |
| 20 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 21 (branch merge, don't forget to commit) | |
| 22 % symlink is other parent, executable is local | |
| 23 a has no flags (default for conflicts) |