Mercurial > evolve
comparison tests/test-evolve-topic.t @ 2929:06844693bb21
tests: update after removing of redundant amend commit
Following e8a7c1a0565a, temporary amend commits has been removed impacting all
revision numbers in tests including amend operations.
Update tests case to use description or hashes when possible and update
revisions number when not.
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Fri, 15 Sep 2017 15:48:18 +0200 |
| parents | 66796d7b5415 |
| children |
comparison
equal
deleted
inserted
replaced
| 2928:6275808e89ef | 2929:06844693bb21 |
|---|---|
| 88 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | 88 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 89 $ echo fff >> fff | 89 $ echo fff >> fff |
| 90 $ hg amend | 90 $ hg amend |
| 91 | 91 |
| 92 $ hg log -G | 92 $ hg log -G |
| 93 @ 13 - {foo} e104f49bab28 add fff (draft) | 93 @ 11 - {foo} e104f49bab28 add fff (draft) |
| 94 | | 94 | |
| 95 | o 11 - {foo} d9cacd156ffc add ddd (draft) | 95 | o 10 - {foo} d9cacd156ffc add ddd (draft) |
| 96 | | | 96 | | |
| 97 | | o 9 - {bar} 1d964213b023 add jjj (draft) | 97 | | o 9 - {bar} 1d964213b023 add jjj (draft) |
| 98 | | | | 98 | | | |
| 99 | | o 8 - {bar} fcab990f3261 add iii (draft) | 99 | | o 8 - {bar} fcab990f3261 add iii (draft) |
| 100 | | | | 100 | | | |
| 117 | 117 |
| 118 Run evolve --all | 118 Run evolve --all |
| 119 | 119 |
| 120 $ hg evolve --all | 120 $ hg evolve --all |
| 121 move:[4] add eee | 121 move:[4] add eee |
| 122 atop:[11] add ddd | 122 atop:[10] add ddd |
| 123 move:[13] add fff | 123 move:[11] add fff |
| 124 atop:[14] add eee | 124 atop:[12] add eee |
| 125 working directory is now at 070c5573d8f9 | 125 working directory is now at 070c5573d8f9 |
| 126 $ hg log -G | 126 $ hg log -G |
| 127 @ 15 - {foo} 070c5573d8f9 add fff (draft) | 127 @ 13 - {foo} 070c5573d8f9 add fff (draft) |
| 128 | | 128 | |
| 129 o 14 - {foo} 42b49017ff90 add eee (draft) | 129 o 12 - {foo} 42b49017ff90 add eee (draft) |
| 130 | | 130 | |
| 131 o 11 - {foo} d9cacd156ffc add ddd (draft) | 131 o 10 - {foo} d9cacd156ffc add ddd (draft) |
| 132 | | 132 | |
| 133 | o 9 - {bar} 1d964213b023 add jjj (draft) | 133 | o 9 - {bar} 1d964213b023 add jjj (draft) |
| 134 | | | 134 | | |
| 135 | o 8 - {bar} fcab990f3261 add iii (draft) | 135 | o 8 - {bar} fcab990f3261 add iii (draft) |
| 136 | | | 136 | | |
| 154 Test that evolve does not loose topic information | 154 Test that evolve does not loose topic information |
| 155 ------------------------------------------------- | 155 ------------------------------------------------- |
| 156 | 156 |
| 157 $ hg evolve --rev 'topic(bar)' | 157 $ hg evolve --rev 'topic(bar)' |
| 158 move:[6] add ggg | 158 move:[6] add ggg |
| 159 atop:[15] add fff | 159 atop:[13] add fff |
| 160 move:[7] add hhh | 160 move:[7] add hhh |
| 161 atop:[16] add ggg | 161 atop:[14] add ggg |
| 162 move:[8] add iii | 162 move:[8] add iii |
| 163 atop:[17] add hhh | 163 atop:[15] add hhh |
| 164 move:[9] add jjj | 164 move:[9] add jjj |
| 165 atop:[18] add iii | 165 atop:[16] add iii |
| 166 working directory is now at 9bf430c106b7 | 166 working directory is now at 9bf430c106b7 |
| 167 $ hg log -G | 167 $ hg log -G |
| 168 @ 19 - {bar} 9bf430c106b7 add jjj (draft) | 168 @ 17 - {bar} 9bf430c106b7 add jjj (draft) |
| 169 | | 169 | |
| 170 o 18 - {bar} d2dc89c57700 add iii (draft) | 170 o 16 - {bar} d2dc89c57700 add iii (draft) |
| 171 | | 171 | |
| 172 o 17 - {bar} 20bc4d02aa62 add hhh (draft) | 172 o 15 - {bar} 20bc4d02aa62 add hhh (draft) |
| 173 | | 173 | |
| 174 o 16 - {bar} 16d6f664b17c add ggg (draft) | 174 o 14 - {bar} 16d6f664b17c add ggg (draft) |
| 175 | | 175 | |
| 176 o 15 - {foo} 070c5573d8f9 add fff (draft) | 176 o 13 - {foo} 070c5573d8f9 add fff (draft) |
| 177 | | 177 | |
| 178 o 14 - {foo} 42b49017ff90 add eee (draft) | 178 o 12 - {foo} 42b49017ff90 add eee (draft) |
| 179 | | 179 | |
| 180 o 11 - {foo} d9cacd156ffc add ddd (draft) | 180 o 10 - {foo} d9cacd156ffc add ddd (draft) |
| 181 | | 181 | |
| 182 o 2 - {foo} cced9bac76e3 add ccc (draft) | 182 o 2 - {foo} cced9bac76e3 add ccc (draft) |
| 183 | | 183 | |
| 184 o 1 - {} a4dbed0837ea add bbb (draft) | 184 o 1 - {} a4dbed0837ea add bbb (draft) |
| 185 | | 185 | |
| 194 $ hg up foo | 194 $ hg up foo |
| 195 switching to topic foo | 195 switching to topic foo |
| 196 0 files updated, 0 files merged, 4 files removed, 0 files unresolved | 196 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
| 197 $ hg prev | 197 $ hg prev |
| 198 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 198 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 199 [14] add eee | 199 [12] add eee |
| 200 $ hg next | 200 $ hg next |
| 201 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 201 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 202 [15] add fff | 202 [13] add fff |
| 203 $ hg next | 203 $ hg next |
| 204 no children on topic "foo" | 204 no children on topic "foo" |
| 205 do you want --no-topic | 205 do you want --no-topic |
| 206 [1] | 206 [1] |
| 207 $ hg next --no-topic | 207 $ hg next --no-topic |
| 208 switching to topic bar | 208 switching to topic bar |
| 209 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 209 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 210 [16] add ggg | 210 [14] add ggg |
| 211 $ hg prev | 211 $ hg prev |
| 212 preserving the current topic 'bar' | 212 preserving the current topic 'bar' |
| 213 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 213 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 214 [15] add fff | 214 [13] add fff |
| 215 $ hg prev | 215 $ hg prev |
| 216 no parent in topic "bar" | 216 no parent in topic "bar" |
| 217 (do you want --no-topic) | 217 (do you want --no-topic) |
| 218 [1] | 218 [1] |
| 219 $ hg prev --no-topic | 219 $ hg prev --no-topic |
| 220 switching to topic foo | 220 switching to topic foo |
| 221 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 221 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 222 [14] add eee | 222 [12] add eee |