tests/test-rawcommit1.out
author mpm@selenic.com
Wed, 27 Jul 2005 18:16:20 -0800
changeset 785 46a8dd3145cc
parent 784 853bfbf1a312
child 793 445970ccf57a
child 808 8f5637f0a0c0
child 814 0902ffece4b4
permissions -rw-r--r--
Fix undo after aborted commit bug Commit would overwrite undo.dirstate unconditionally, so an undo after an aborted commit would restore the dirstate from the aborted commit and not the prior transaction. This copies dirstate to journal.dirstate and moves it after a successful transaction.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
     1
+ hg --debug init
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
     2
+ echo this is a1
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
     3
+ hg add a
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 591
diff changeset
     4
+ hg commit -m0 -d '0 0'
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
     5
+ echo this is b1
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
     6
+ hg add b
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 591
diff changeset
     7
+ hg commit -m1 -d '0 0'
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
     8
+ hg manifest 1
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
     9
05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    10
54837d97f2932a8194e69745a280a2c11e61ff9c 644 b
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    11
+ echo this is c1
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 591
diff changeset
    12
+ hg rawcommit -p 1 -d '0 0' -m2 c
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
    13
+ hg manifest 2
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    14
05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    15
54837d97f2932a8194e69745a280a2c11e61ff9c 644 b
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    16
76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
    17
+ hg parents
784
853bfbf1a312 Fix tests for short changeset hashes and hidden manifest hashes
mpm@selenic.com
parents: 749
diff changeset
    18
changeset:   2:9f827976dae4
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    19
tag:         tip
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 591
diff changeset
    20
user:        test
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    21
date:        Thu Jan  1 00:00:00 1970
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
    22
summary:     2
546
c8ae964109c1 Add an empty line after description in verbose mode of show_changeset.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 495
diff changeset
    23
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    24
+ rm b
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 591
diff changeset
    25
+ hg rawcommit -p 2 -d '0 0' -m3 b
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
    26
+ hg manifest 3
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    27
05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    28
76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
    29
+ hg parents
784
853bfbf1a312 Fix tests for short changeset hashes and hidden manifest hashes
mpm@selenic.com
parents: 749
diff changeset
    30
changeset:   3:c8225a106186
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    31
tag:         tip
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 591
diff changeset
    32
user:        test
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    33
date:        Thu Jan  1 00:00:00 1970
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
    34
summary:     3
546
c8ae964109c1 Add an empty line after description in verbose mode of show_changeset.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 495
diff changeset
    35
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    36
+ echo this is a22
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 591
diff changeset
    37
+ hg rawcommit -p 3 -d '0 0' -m4 a
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
    38
+ hg manifest 4
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    39
d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    40
76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
    41
+ hg parents
784
853bfbf1a312 Fix tests for short changeset hashes and hidden manifest hashes
mpm@selenic.com
parents: 749
diff changeset
    42
changeset:   4:8dfeee82a94b
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    43
tag:         tip
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 591
diff changeset
    44
user:        test
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    45
date:        Thu Jan  1 00:00:00 1970
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
    46
summary:     4
546
c8ae964109c1 Add an empty line after description in verbose mode of show_changeset.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 495
diff changeset
    47
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    48
+ echo this is c22
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 591
diff changeset
    49
+ hg rawcommit -p 1 -d '0 0' -m5 c
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
    50
+ hg manifest 5
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    51
05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    52
54837d97f2932a8194e69745a280a2c11e61ff9c 644 b
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    53
3570202ceac2b52517df64ebd0a062cb0d8fe33a 644 c
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
    54
+ hg parents
784
853bfbf1a312 Fix tests for short changeset hashes and hidden manifest hashes
mpm@selenic.com
parents: 749
diff changeset
    55
changeset:   4:8dfeee82a94b
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 591
diff changeset
    56
user:        test
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    57
date:        Thu Jan  1 00:00:00 1970
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
    58
summary:     4
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    59
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 591
diff changeset
    60
+ hg rawcommit -p 4 -p 5 -d '0 0' -m6
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
    61
+ hg manifest 6
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    62
d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    63
76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
    64
+ hg parents
784
853bfbf1a312 Fix tests for short changeset hashes and hidden manifest hashes
mpm@selenic.com
parents: 749
diff changeset
    65
changeset:   6:c0e932ecae5e
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    66
tag:         tip
784
853bfbf1a312 Fix tests for short changeset hashes and hidden manifest hashes
mpm@selenic.com
parents: 749
diff changeset
    67
parent:      4:8dfeee82a94b
853bfbf1a312 Fix tests for short changeset hashes and hidden manifest hashes
mpm@selenic.com
parents: 749
diff changeset
    68
parent:      5:a7925a42d0df
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 591
diff changeset
    69
user:        test
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    70
date:        Thu Jan  1 00:00:00 1970
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
    71
summary:     6
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    72
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 591
diff changeset
    73
+ hg rawcommit -p 6 -d '0 0' -m7
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
    74
+ hg manifest 7
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    75
d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    76
76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
    77
+ hg parents
784
853bfbf1a312 Fix tests for short changeset hashes and hidden manifest hashes
mpm@selenic.com
parents: 749
diff changeset
    78
changeset:   7:3a157da4365d
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    79
tag:         tip
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 591
diff changeset
    80
user:        test
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    81
date:        Thu Jan  1 00:00:00 1970
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
    82
summary:     7
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    83