Mercurial Mercurial > hg > mercurial-crew-with-dirclash / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-tags.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:
345
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
     1
 
+ hg init
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
     2
 
+ hg id
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
     3
 
unknown
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
     4
 
+ hg add a
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 749
diff changeset 
     5
 
+ hg commit -m test -d 0 0
345
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
     6
 
+ hg co
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
     7
 
+ hg identify
374
f07d00fcd281 update tests to reflect new short hash length
mpm@selenic.com
parents: 345
diff changeset 
     8
 
acb14030fe0a tip
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 749
diff changeset 
     9
 
+ hg -q tip
345
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
    10
 
acb14030fe0a21b60322c440ad2d20cf7685a376 first
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
    11
 
+ hg add .hgtags
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 749
diff changeset 
    12
 
+ hg commit -m add tags -d 0 0
345
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
    13
 
+ hg tags
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 749
diff changeset 
    14
 
tip                                1:b53d0e1f3043ecbccf1b9ad2cea562c1b50462b2
345
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
    15
 
first                              0:acb14030fe0a21b60322c440ad2d20cf7685a376
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 749
diff changeset 
    16
 
hg -q tip                          ?:?
345
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
    17
 
+ hg identify
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 749
diff changeset 
    18
 
b53d0e1f3043 tip
345
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
    19
 
+ hg status
748
c5df1a9c5276 Update test output for status change
mpm@selenic.com
parents: 561
diff changeset 
    20
 
M a
345
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
    21
 
+ hg identify
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 749
diff changeset 
    22
 
b53d0e1f3043+ tip
345
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
    23
 
+ hg co first
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
    24
 
+ hg id
374
f07d00fcd281 update tests to reflect new short hash length
mpm@selenic.com
parents: 345
diff changeset 
    25
 
acb14030fe0a+ first
345
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
    26
 
+ hg -v id
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
    27
 
acb14030fe0a21b60322c440ad2d20cf7685a376+ first
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
    28
 
+ hg status
748
c5df1a9c5276 Update test output for status change
mpm@selenic.com
parents: 561
diff changeset 
    29
 
M a
345
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
    30
 
+ hg add b
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 749
diff changeset 
    31
 
+ hg commit -m branch -d 0 0
345
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
    32
 
+ hg id
374
f07d00fcd281 update tests to reflect new short hash length
mpm@selenic.com
parents: 345
diff changeset 
    33
 
c8edf04160c7 tip
345
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
    34
 
+ hg co -m 1
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
    35
 
+ hg id
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 749
diff changeset 
    36
 
c8edf04160c7+b53d0e1f3043+ tip
345
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
    37
 
+ hg status
748
c5df1a9c5276 Update test output for status change
mpm@selenic.com
parents: 561
diff changeset 
    38
 
M .hgtags
c5df1a9c5276 Update test output for status change
mpm@selenic.com
parents: 561
diff changeset 
    39
 
M a
mercurial-crew-with-dirclash