Mercurial > hg-stable
comparison tests/test-histedit-edit.out @ 17067:81d681f8bdc1
test-histedit-edit: improve coverage of histedit code
| author | Augie Fackler <raf@durin42.com> |
|---|---|
| date | Wed, 27 Jun 2012 18:41:14 -0500 |
| parents | 168cc52ad7c2 |
| children |
comparison
equal
deleted
inserted
replaced
| 17066:baf8887d40e2 | 17067:81d681f8bdc1 |
|---|---|
| 32 | 32 |
| 33 % edit the history | 33 % edit the history |
| 34 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | 34 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
| 35 abort: Make changes as needed, you may commit or record as needed now. | 35 abort: Make changes as needed, you may commit or record as needed now. |
| 36 When you are finished, run hg histedit --continue to resume. | 36 When you are finished, run hg histedit --continue to resume. |
| 37 % edit the revision | 37 % commit, then edit the revision |
| 38 created new head | |
| 38 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 39 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 39 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 40 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 40 @ changeset: 5:c38516e9ed62 | 41 @ changeset: 6:bf757c081cd0 |
| 41 | tag: tip | 42 | tag: tip |
| 42 | user: test | 43 | user: test |
| 43 | date: Thu Jan 01 00:00:00 1970 +0000 | 44 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 44 | summary: f | 45 | summary: f |
| 45 | | 46 | |
| 46 o changeset: 4:1da62d13177d | 47 o changeset: 5:d6b15fed32d4 |
| 47 | user: test | 48 | user: test |
| 48 | date: Thu Jan 01 00:00:00 1970 +0000 | 49 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 49 | summary: foobaz | 50 | summary: foobaz |
| 51 | | |
| 52 o changeset: 4:1a60820cd1f6 | |
| 53 | user: test | |
| 54 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 55 | summary: wat | |
| 50 | | 56 | |
| 51 o changeset: 3:055a42cdd887 | 57 o changeset: 3:055a42cdd887 |
| 52 | user: test | 58 | user: test |
| 53 | date: Thu Jan 01 00:00:00 1970 +0000 | 59 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 54 | summary: d | 60 | summary: d |
| 74 abort: Make changes as needed, you may commit or record as needed now. | 80 abort: Make changes as needed, you may commit or record as needed now. |
| 75 When you are finished, run hg histedit --continue to resume. | 81 When you are finished, run hg histedit --continue to resume. |
| 76 A f | 82 A f |
| 77 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 83 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 78 % log after edit | 84 % log after edit |
| 79 changeset: 5:c38516e9ed62 | 85 changeset: 6:bf757c081cd0 |
| 80 tag: tip | 86 tag: tip |
| 81 user: test | 87 user: test |
| 82 date: Thu Jan 01 00:00:00 1970 +0000 | 88 date: Thu Jan 01 00:00:00 1970 +0000 |
| 83 summary: f | 89 summary: f |
| 84 | 90 |
| 85 % say we'll change the message, but don't. | 91 % say we'll change the message, but don't. |
| 86 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 92 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 87 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 93 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 88 changeset: 5:c38516e9ed62 | 94 changeset: 6:bf757c081cd0 |
| 89 tag: tip | 95 tag: tip |
| 90 user: test | 96 user: test |
| 91 date: Thu Jan 01 00:00:00 1970 +0000 | 97 date: Thu Jan 01 00:00:00 1970 +0000 |
| 92 summary: f | 98 summary: f |
| 93 | 99 |
| 94 % modify the message | 100 % modify the message |
| 95 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 101 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 96 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 102 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 97 changeset: 5:4d6a10bcf3e3 | 103 changeset: 6:0b16746f8e89 |
| 98 tag: tip | 104 tag: tip |
| 99 user: test | 105 user: test |
| 100 date: Thu Jan 01 00:00:00 1970 +0000 | 106 date: Thu Jan 01 00:00:00 1970 +0000 |
| 101 summary: mess c38516e9ed62 f | 107 summary: mess bf757c081cd0 f |
| 102 | 108 |
| 103 % rollback should not work after a histedit | 109 % rollback should not work after a histedit |
| 104 no rollback information available | 110 no rollback information available |
| 105 % EOF | 111 % EOF |