test-histedit-edit.out
111 lines
| 3.1 KiB
| text/plain
|
TextLexer
/ tests / test-histedit-edit.out
|
r17064 | % log before edit | ||
@ changeset: 5:652413bf663e | ||||
| tag: tip | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: f | ||||
| | ||||
o changeset: 4:e860deea161a | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: e | ||||
| | ||||
o changeset: 3:055a42cdd887 | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: d | ||||
| | ||||
o changeset: 2:177f92b77385 | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: c | ||||
| | ||||
o changeset: 1:d2ae7f538514 | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: b | ||||
| | ||||
o changeset: 0:cb9a9f314b8b | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: a | ||||
% edit the history | ||||
0 files updated, 0 files merged, 2 files removed, 0 files unresolved | ||||
abort: Make changes as needed, you may commit or record as needed now. | ||||
When you are finished, run hg histedit --continue to resume. | ||||
|
r17067 | % commit, then edit the revision | ||
created new head | ||||
|
r17064 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
|
r17067 | @ changeset: 6:bf757c081cd0 | ||
|
r17064 | | tag: tip | ||
| user: test | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: f | ||||
| | ||||
|
r17067 | o changeset: 5:d6b15fed32d4 | ||
|
r17064 | | user: test | ||
| date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: foobaz | ||||
| | ||||
|
r17067 | o changeset: 4:1a60820cd1f6 | ||
| user: test | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: wat | ||||
| | ||||
|
r17064 | o changeset: 3:055a42cdd887 | ||
| user: test | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: d | ||||
| | ||||
o changeset: 2:177f92b77385 | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: c | ||||
| | ||||
o changeset: 1:d2ae7f538514 | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: b | ||||
| | ||||
o changeset: 0:cb9a9f314b8b | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: a | ||||
% contents of e: | ||||
a | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
abort: Make changes as needed, you may commit or record as needed now. | ||||
When you are finished, run hg histedit --continue to resume. | ||||
A f | ||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
% log after edit | ||||
|
r17067 | changeset: 6:bf757c081cd0 | ||
|
r17064 | tag: tip | ||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: f | ||||
% say we'll change the message, but don't. | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
|
r17067 | changeset: 6:bf757c081cd0 | ||
|
r17064 | tag: tip | ||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: f | ||||
% modify the message | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
|
r17067 | changeset: 6:0b16746f8e89 | ||
|
r17064 | tag: tip | ||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
|
r17067 | summary: mess bf757c081cd0 f | ||
|
r17064 | |||
% rollback should not work after a histedit | ||||
no rollback information available | ||||
% EOF | ||||