Mercurial > evolve
comparison tests/test-evolve-topic.t @ 3105:f5d472b7e800 mercurial-4.3
test-compat: revert output changes related to temporary amend commit
This backed out changeset 06844693bb21 and other related changes.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 20 Oct 2017 19:32:18 +0200 |
| parents | 945a0989e41b |
| children | a867d59ea97a |
comparison
equal
deleted
inserted
replaced
| 3104:3dd5a6f83f8b | 3105:f5d472b7e800 |
|---|---|
| 92 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | 92 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 93 $ echo fff >> fff | 93 $ echo fff >> fff |
| 94 $ hg amend | 94 $ hg amend |
| 95 | 95 |
| 96 $ hg log -G | 96 $ hg log -G |
| 97 @ 11 - {foo} e104f49bab28 add fff (draft) | 97 @ 13 - {foo} e104f49bab28 add fff (draft) |
| 98 | | 98 | |
| 99 | o 10 - {foo} d9cacd156ffc add ddd (draft) | 99 | o 11 - {foo} d9cacd156ffc add ddd (draft) |
| 100 | | | 100 | | |
| 101 | | o 9 - {bar} 1d964213b023 add jjj (draft) | 101 | | o 9 - {bar} 1d964213b023 add jjj (draft) |
| 102 | | | | 102 | | | |
| 103 | | o 8 - {bar} fcab990f3261 add iii (draft) | 103 | | o 8 - {bar} fcab990f3261 add iii (draft) |
| 104 | | | | 104 | | | |
| 121 | 121 |
| 122 Run evolve --all | 122 Run evolve --all |
| 123 | 123 |
| 124 $ hg evolve --all | 124 $ hg evolve --all |
| 125 move:[4] add eee | 125 move:[4] add eee |
| 126 atop:[10] add ddd | 126 atop:[11] add ddd |
| 127 move:[11] add fff | 127 move:[13] add fff |
| 128 atop:[12] add eee | 128 atop:[14] add eee |
| 129 working directory is now at 070c5573d8f9 | 129 working directory is now at 070c5573d8f9 |
| 130 $ hg log -G | 130 $ hg log -G |
| 131 @ 13 - {foo} 070c5573d8f9 add fff (draft) | 131 @ 15 - {foo} 070c5573d8f9 add fff (draft) |
| 132 | | 132 | |
| 133 o 12 - {foo} 42b49017ff90 add eee (draft) | 133 o 14 - {foo} 42b49017ff90 add eee (draft) |
| 134 | | 134 | |
| 135 o 10 - {foo} d9cacd156ffc add ddd (draft) | 135 o 11 - {foo} d9cacd156ffc add ddd (draft) |
| 136 | | 136 | |
| 137 | o 9 - {bar} 1d964213b023 add jjj (draft) | 137 | o 9 - {bar} 1d964213b023 add jjj (draft) |
| 138 | | | 138 | | |
| 139 | o 8 - {bar} fcab990f3261 add iii (draft) | 139 | o 8 - {bar} fcab990f3261 add iii (draft) |
| 140 | | | 140 | | |
| 158 Test that evolve does not loose topic information | 158 Test that evolve does not loose topic information |
| 159 ------------------------------------------------- | 159 ------------------------------------------------- |
| 160 | 160 |
| 161 $ hg evolve --rev 'topic(bar)' | 161 $ hg evolve --rev 'topic(bar)' |
| 162 move:[6] add ggg | 162 move:[6] add ggg |
| 163 atop:[13] add fff | 163 atop:[15] add fff |
| 164 move:[7] add hhh | 164 move:[7] add hhh |
| 165 atop:[14] add ggg | 165 atop:[16] add ggg |
| 166 move:[8] add iii | 166 move:[8] add iii |
| 167 atop:[15] add hhh | 167 atop:[17] add hhh |
| 168 move:[9] add jjj | 168 move:[9] add jjj |
| 169 atop:[16] add iii | 169 atop:[18] add iii |
| 170 working directory is now at 9bf430c106b7 | 170 working directory is now at 9bf430c106b7 |
| 171 $ hg log -G | 171 $ hg log -G |
| 172 @ 17 - {bar} 9bf430c106b7 add jjj (draft) | 172 @ 19 - {bar} 9bf430c106b7 add jjj (draft) |
| 173 | | 173 | |
| 174 o 16 - {bar} d2dc89c57700 add iii (draft) | 174 o 18 - {bar} d2dc89c57700 add iii (draft) |
| 175 | | 175 | |
| 176 o 15 - {bar} 20bc4d02aa62 add hhh (draft) | 176 o 17 - {bar} 20bc4d02aa62 add hhh (draft) |
| 177 | | 177 | |
| 178 o 14 - {bar} 16d6f664b17c add ggg (draft) | 178 o 16 - {bar} 16d6f664b17c add ggg (draft) |
| 179 | | 179 | |
| 180 o 13 - {foo} 070c5573d8f9 add fff (draft) | 180 o 15 - {foo} 070c5573d8f9 add fff (draft) |
| 181 | | 181 | |
| 182 o 12 - {foo} 42b49017ff90 add eee (draft) | 182 o 14 - {foo} 42b49017ff90 add eee (draft) |
| 183 | | 183 | |
| 184 o 10 - {foo} d9cacd156ffc add ddd (draft) | 184 o 11 - {foo} d9cacd156ffc add ddd (draft) |
| 185 | | 185 | |
| 186 o 2 - {foo} cced9bac76e3 add ccc (draft) | 186 o 2 - {foo} cced9bac76e3 add ccc (draft) |
| 187 | | 187 | |
| 188 o 1 - {} a4dbed0837ea add bbb (draft) | 188 o 1 - {} a4dbed0837ea add bbb (draft) |
| 189 | | 189 | |
| 198 $ hg up foo | 198 $ hg up foo |
| 199 switching to topic foo | 199 switching to topic foo |
| 200 0 files updated, 0 files merged, 4 files removed, 0 files unresolved | 200 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
| 201 $ hg prev | 201 $ hg prev |
| 202 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 202 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 203 [12] add eee | 203 [14] add eee |
| 204 $ hg next | 204 $ hg next |
| 205 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 205 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 206 [13] add fff | 206 [15] add fff |
| 207 $ hg next | 207 $ hg next |
| 208 no children on topic "foo" | 208 no children on topic "foo" |
| 209 do you want --no-topic | 209 do you want --no-topic |
| 210 [1] | 210 [1] |
| 211 $ hg next --no-topic | 211 $ hg next --no-topic |
| 212 switching to topic bar | 212 switching to topic bar |
| 213 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 213 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 214 [14] add ggg | 214 [16] add ggg |
| 215 $ hg prev | 215 $ hg prev |
| 216 preserving the current topic 'bar' | 216 preserving the current topic 'bar' |
| 217 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 217 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 218 [13] add fff | 218 [15] add fff |
| 219 $ hg prev | 219 $ hg prev |
| 220 no parent in topic "bar" | 220 no parent in topic "bar" |
| 221 (do you want --no-topic) | 221 (do you want --no-topic) |
| 222 [1] | 222 [1] |
| 223 $ hg prev --no-topic | 223 $ hg prev --no-topic |
| 224 switching to topic foo | 224 switching to topic foo |
| 225 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 225 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 226 [12] add eee | 226 [14] add eee |