Mercurial > hg
annotate tests/test-rollback.out @ 10467:16c68fd720ab stable
patch: remove useless copy, cleanup
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Sun, 14 Feb 2010 17:53:23 +0100 |
| parents | a5f3f9b1c42a |
| children | f0bfe42c7b1f |
| rev | line source |
|---|---|
| 336 | 1 checking changesets |
| 2 checking manifests | |
| 3 crosschecking files in changesets and manifests | |
| 4 checking files | |
| 5 1 files, 1 changesets, 1 total revisions | |
|
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
981
diff
changeset
|
6 changeset: 0:0acdaf898367 |
|
388
398737777644
Fixed tests for displaying tags in hg history and hg parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
382
diff
changeset
|
7 tag: tip |
| 336 | 8 user: test |
|
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
981
diff
changeset
|
9 date: Mon Jan 12 13:46:40 1970 +0000 |
| 336 | 10 summary: test |
| 11 | |
| 502 | 12 rolling back last transaction |
| 336 | 13 checking changesets |
| 14 checking manifests | |
| 15 crosschecking files in changesets and manifests | |
| 16 checking files | |
| 17 0 files, 0 changesets, 0 total revisions | |
| 18 A a | |
|
6058
88b4d726332a
Do not abort rollback if undo.branch isn't available, but warn.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5814
diff
changeset
|
19 % Test issue 902 |
|
5814
dd5a501cb97f
restore branch after rollback (issue 902)
Alexandre Vassalotti <mercurial-bugs@selenic.com>
parents:
2227
diff
changeset
|
20 marked working directory as branch test |
|
dd5a501cb97f
restore branch after rollback (issue 902)
Alexandre Vassalotti <mercurial-bugs@selenic.com>
parents:
2227
diff
changeset
|
21 rolling back last transaction |
|
dd5a501cb97f
restore branch after rollback (issue 902)
Alexandre Vassalotti <mercurial-bugs@selenic.com>
parents:
2227
diff
changeset
|
22 default |
|
9934
720f70b720d3
commit: save commit message so it's not destroyed by rollback.
Greg Ward <greg-hg@gerg.ca>
parents:
6058
diff
changeset
|
23 % Test issue 1635 (commit message saved) |
|
720f70b720d3
commit: save commit message so it's not destroyed by rollback.
Greg Ward <greg-hg@gerg.ca>
parents:
6058
diff
changeset
|
24 .hg/last-message.txt: |
|
720f70b720d3
commit: save commit message so it's not destroyed by rollback.
Greg Ward <greg-hg@gerg.ca>
parents:
6058
diff
changeset
|
25 test2 |
|
6058
88b4d726332a
Do not abort rollback if undo.branch isn't available, but warn.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5814
diff
changeset
|
26 % Test rollback of hg before issue 902 was fixed |
|
88b4d726332a
Do not abort rollback if undo.branch isn't available, but warn.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5814
diff
changeset
|
27 marked working directory as branch test |
|
88b4d726332a
Do not abort rollback if undo.branch isn't available, but warn.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5814
diff
changeset
|
28 rolling back last transaction |
|
88b4d726332a
Do not abort rollback if undo.branch isn't available, but warn.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5814
diff
changeset
|
29 Named branch could not be reset, current branch still is: test |
|
88b4d726332a
Do not abort rollback if undo.branch isn't available, but warn.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5814
diff
changeset
|
30 test |
|
9934
720f70b720d3
commit: save commit message so it's not destroyed by rollback.
Greg Ward <greg-hg@gerg.ca>
parents:
6058
diff
changeset
|
31 % rollback by pretxncommit saves commit message (issue 1635) |
|
720f70b720d3
commit: save commit message so it's not destroyed by rollback.
Greg Ward <greg-hg@gerg.ca>
parents:
6058
diff
changeset
|
32 transaction abort! |
|
720f70b720d3
commit: save commit message so it's not destroyed by rollback.
Greg Ward <greg-hg@gerg.ca>
parents:
6058
diff
changeset
|
33 rollback completed |
|
10081
a5f3f9b1c42a
test-rollback: Ignore hook exit code
Mads Kiilerich <mads@kiilerich.com>
parents:
9935
diff
changeset
|
34 abort: pretxncommit hook exited ... |
|
9934
720f70b720d3
commit: save commit message so it's not destroyed by rollback.
Greg Ward <greg-hg@gerg.ca>
parents:
6058
diff
changeset
|
35 .hg/last-message.txt: |
|
720f70b720d3
commit: save commit message so it's not destroyed by rollback.
Greg Ward <greg-hg@gerg.ca>
parents:
6058
diff
changeset
|
36 precious commit message |
|
9935
48b81d9bca8d
commit: if relevant, tell user their commit message was saved.
Greg Ward <greg-hg@gerg.ca>
parents:
9934
diff
changeset
|
37 % same thing, but run $EDITOR |
|
48b81d9bca8d
commit: if relevant, tell user their commit message was saved.
Greg Ward <greg-hg@gerg.ca>
parents:
9934
diff
changeset
|
38 transaction abort! |
|
48b81d9bca8d
commit: if relevant, tell user their commit message was saved.
Greg Ward <greg-hg@gerg.ca>
parents:
9934
diff
changeset
|
39 rollback completed |
|
48b81d9bca8d
commit: if relevant, tell user their commit message was saved.
Greg Ward <greg-hg@gerg.ca>
parents:
9934
diff
changeset
|
40 note: commit message saved in .hg/last-message.txt |
|
10081
a5f3f9b1c42a
test-rollback: Ignore hook exit code
Mads Kiilerich <mads@kiilerich.com>
parents:
9935
diff
changeset
|
41 abort: pretxncommit hook exited ... |
|
9935
48b81d9bca8d
commit: if relevant, tell user their commit message was saved.
Greg Ward <greg-hg@gerg.ca>
parents:
9934
diff
changeset
|
42 .hg/last-message.txt: |
|
48b81d9bca8d
commit: if relevant, tell user their commit message was saved.
Greg Ward <greg-hg@gerg.ca>
parents:
9934
diff
changeset
|
43 another precious commit message |