tests/test-copy.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:
363
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
     1
+ hg init
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
     2
+ hg add a
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 793
diff changeset
     3
+ hg commit -m 1 -d 0 0
363
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
     4
+ hg status
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
     5
+ hg copy a b
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
     6
+ hg status
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
     7
A b
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 793
diff changeset
     8
+ hg --debug commit -m 2 -d 0 0
363
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
     9
b
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
    10
 b: copy a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
    11
+ hg history
784
853bfbf1a312 Fix tests for short changeset hashes and hidden manifest hashes
mpm@selenic.com
parents: 749
diff changeset
    12
changeset:   1:3b5b84850bbe
388
398737777644 Fixed tests for displaying tags in hg history and hg parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 382
diff changeset
    13
tag:         tip
363
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
    14
user:        test
382
37249c522770 test suite: fix timezone problems and port collision problem
mpm@selenic.com
parents: 363
diff changeset
    15
date:        Thu Jan  1 00:00:00 1970
363
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
    16
summary:     2
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
    17
784
853bfbf1a312 Fix tests for short changeset hashes and hidden manifest hashes
mpm@selenic.com
parents: 749
diff changeset
    18
changeset:   0:c19d34741b0a
363
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
    19
user:        test
382
37249c522770 test suite: fix timezone problems and port collision problem
mpm@selenic.com
parents: 363
diff changeset
    20
date:        Thu Jan  1 00:00:00 1970
363
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
    21
summary:     1
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
    22
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
    23
+ hg log a
784
853bfbf1a312 Fix tests for short changeset hashes and hidden manifest hashes
mpm@selenic.com
parents: 749
diff changeset
    24
changeset:   0:c19d34741b0a
363
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
    25
user:        test
382
37249c522770 test suite: fix timezone problems and port collision problem
mpm@selenic.com
parents: 363
diff changeset
    26
date:        Thu Jan  1 00:00:00 1970
363
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
    27
summary:     1
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
    28
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 793
diff changeset
    29
566e338d09a089ba737c21e0d3759980  .hg/data/b.d
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 793
diff changeset
    30
3268d2f51b2d2d423ff01b59eb6fbb14  bsum
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 793
diff changeset
    31
70909ca2ecf494c71e9184b445e040ee  asum
363
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
    32
+ hg verify
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
    33
checking changesets
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
    34
checking manifests
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
    35
crosschecking files in changesets and manifests
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
    36
checking files
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
    37
2 files, 2 changesets, 2 total revisions