Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-merge8.out @ 3838:dec4eba7ccad
Use util.always instead of creating a new lambda function in show_changeset
and simplify the expression.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Sat, 09 Dec 2006 09:30:29 +0100 |
parents | 9103dab96093 |
children | 4787e2b0dd03 |
rev | line source |
---|---|
3389
efbe24c7d8d9
Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
efbe24c7d8d9
Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
2 pulling from ../a |
efbe24c7d8d9
Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
3 searching for changes |
efbe24c7d8d9
Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
4 adding changesets |
efbe24c7d8d9
Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
5 adding manifests |
efbe24c7d8d9
Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
6 adding file changes |
efbe24c7d8d9
Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
7 added 2 changesets with 2 changes to 1 files |
efbe24c7d8d9
Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
8 (run 'hg update' to get a working copy) |
3674
9103dab96093
avoid unnecessary copy merges
Matt Mackall <mpm@selenic.com>
parents:
3389
diff
changeset
|
9 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |