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.

+ hg --debug init
+ echo this is a1
+ hg add a
+ hg commit -m0 -d '0 0'
+ echo this is b1
+ hg add b
+ hg commit -m1 -d '0 0'
+ hg manifest 1
05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
54837d97f2932a8194e69745a280a2c11e61ff9c 644 b
+ echo this is c1
+ hg rawcommit -p 1 -d '0 0' -m2 c
+ hg manifest 2
05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
54837d97f2932a8194e69745a280a2c11e61ff9c 644 b
76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
+ hg parents
changeset:   2:9f827976dae4
tag:         tip
user:        test
date:        Thu Jan  1 00:00:00 1970
summary:     2

+ rm b
+ hg rawcommit -p 2 -d '0 0' -m3 b
+ hg manifest 3
05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
+ hg parents
changeset:   3:c8225a106186
tag:         tip
user:        test
date:        Thu Jan  1 00:00:00 1970
summary:     3

+ echo this is a22
+ hg rawcommit -p 3 -d '0 0' -m4 a
+ hg manifest 4
d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
+ hg parents
changeset:   4:8dfeee82a94b
tag:         tip
user:        test
date:        Thu Jan  1 00:00:00 1970
summary:     4

+ echo this is c22
+ hg rawcommit -p 1 -d '0 0' -m5 c
+ hg manifest 5
05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
54837d97f2932a8194e69745a280a2c11e61ff9c 644 b
3570202ceac2b52517df64ebd0a062cb0d8fe33a 644 c
+ hg parents
changeset:   4:8dfeee82a94b
user:        test
date:        Thu Jan  1 00:00:00 1970
summary:     4

+ hg rawcommit -p 4 -p 5 -d '0 0' -m6
+ hg manifest 6
d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
+ hg parents
changeset:   6:c0e932ecae5e
tag:         tip
parent:      4:8dfeee82a94b
parent:      5:a7925a42d0df
user:        test
date:        Thu Jan  1 00:00:00 1970
summary:     6

+ hg rawcommit -p 6 -d '0 0' -m7
+ hg manifest 7
d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
+ hg parents
changeset:   7:3a157da4365d
tag:         tip
user:        test
date:        Thu Jan  1 00:00:00 1970
summary:     7