Mercurial > hg

annotate tests/test-merge8.out @ 4384:caaba589d9c7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use patch.patch() when checking for patch availability. The test is closer to what we want to know. It also makes sense when you deal with patched versions of patch() as most people do under win32.
author Patrick Mezard <pmezard@gmail.com>
date Sat, 28 Apr 2007 11:53:36 +0200
parents 4787e2b0dd03
children bb1800a7d7e1
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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)
4304
4787e2b0dd03 merge: fix a bug where copies were ignored
Matt Mackall <mpm@selenic.com>
parents: 3674
diff changeset
9 merging a and b
4787e2b0dd03 merge: fix a bug where copies were ignored
Matt Mackall <mpm@selenic.com>
parents: 3674
diff changeset
10 0 files updated, 1 files merged, 0 files removed, 0 files unresolved