tests/test-simple-update.out
author Thomas Arendsen Hein <thomas@intevation.de>
Wed, 10 Aug 2005 06:47:46 +0100
changeset 862 d70c1c31fd45
parent 814 0902ffece4b4
child 925 5a034646e472
permissions -rw-r--r--
Fix 3-way-merge of original parent, workdir and new parent. The dirstate has to match what is in the repository (what would be checked out with 'hg update -C'), because the resulting file may be identical to the new parent, or it may be completely different. Previously the dirstate wasn't updated, so if you changed the file to look like the original parent, it might be considered unmodified relative to the new parent.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
     1
+ hg init
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
     2
+ hg addremove
767
61ed30e82b27 Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents: 749
diff changeset
     3
adding foo
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 676
diff changeset
     4
+ hg commit -m 1
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
     5
+ hg verify
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
     6
checking changesets
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
     7
checking manifests
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
     8
crosschecking files in changesets and manifests
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
     9
checking files
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    10
1 files, 1 changesets, 1 total revisions
485
c5705ab9cebd [PATCH] add clone command
mpm@selenic.com
parents: 429
diff changeset
    11
+ hg clone . ../branch
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    12
+ hg co
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 676
diff changeset
    13
+ hg commit -m 2
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    14
+ hg pull ../branch
404
a1ecef497721 [PATCH] Unintuive use
mpm@selenic.com
parents: 350
diff changeset
    15
pulling from ../branch
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    16
searching for changes
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    17
adding changesets
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    18
adding manifests
775
122449dd89db Fix up test results
mpm@selenic.com
parents: 767
diff changeset
    19
adding file changes
122449dd89db Fix up test results
mpm@selenic.com
parents: 767
diff changeset
    20
added 1 changesets with 1 changes to 1 files
404
a1ecef497721 [PATCH] Unintuive use
mpm@selenic.com
parents: 350
diff changeset
    21
(run 'hg update' to get a working copy)
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    22
+ hg verify
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    23
checking changesets
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    24
checking manifests
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    25
crosschecking files in changesets and manifests
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    26
checking files
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    27
1 files, 2 changesets, 2 total revisions
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    28
+ hg co
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    29
foo
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    30
bar
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    31
+ hg manifest
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    32
6f4310b00b9a147241b071a60c28a650827fb03d 644 foo