Mercurial > evolve
comparison tests/test-stabilize-result.t @ 718:29abdb2aeccb
evolve: update test output.
| author | Levi Bard <levi@unity3d.com> |
|---|---|
| date | Sun, 10 Feb 2013 16:14:45 +0100 |
| parents | dba3ed9f2c4f |
| children | 06cd220141ba |
comparison
equal
deleted
inserted
replaced
| 712:2bd6016de593 | 718:29abdb2aeccb |
|---|---|
| 155 $ hg evolve --any | 155 $ hg evolve --any |
| 156 recreate:[12] newer a | 156 recreate:[12] newer a |
| 157 atop:[8] newer a | 157 atop:[8] newer a |
| 158 rebasing to destination parent: e8cc1b534401 | 158 rebasing to destination parent: e8cc1b534401 |
| 159 computing new diff | 159 computing new diff |
| 160 commited as eeeb8f6e7648 | 160 commited as 503ef784bae6 |
| 161 $ glog | 161 $ glog |
| 162 @ 14:eeeb8f6e7648@default(draft) bk:[] bumped update to e3183e9c0961: | 162 @ 14:503ef784bae6@default(draft) bk:[] bumped update to e3183e9c0961: |
| 163 | | 163 | |
| 164 | o 9:355c5cda4de1@default(draft) bk:[] add c | 164 | o 9:355c5cda4de1@default(draft) bk:[] add c |
| 165 | | | 165 | | |
| 166 o | 8:e3183e9c0961@default(public) bk:[] newer a | 166 o | 8:e3183e9c0961@default(public) bk:[] newer a |
| 167 |/ | 167 |/ |
| 186 > EOF | 186 > EOF |
| 187 $ hg ci -m 'More addition' | 187 $ hg ci -m 'More addition' |
| 188 $ glog | 188 $ glog |
| 189 @ 15:7391601a4bfa@default(draft) bk:[] More addition | 189 @ 15:7391601a4bfa@default(draft) bk:[] More addition |
| 190 | | 190 | |
| 191 | o 14:eeeb8f6e7648@default(draft) bk:[] bumped update to e3183e9c0961: | 191 | o 14:503ef784bae6@default(draft) bk:[] bumped update to e3183e9c0961: |
| 192 | | | 192 | | |
| 193 o | 9:355c5cda4de1@default(draft) bk:[] add c | 193 o | 9:355c5cda4de1@default(draft) bk:[] add c |
| 194 | | | 194 | | |
| 195 | o 8:e3183e9c0961@default(public) bk:[] newer a | 195 | o 8:e3183e9c0961@default(public) bk:[] newer a |
| 196 |/ | 196 |/ |
| 212 $ glog | 212 $ glog |
| 213 @ 19:3883461cc228@default(draft) bk:[] More addition | 213 @ 19:3883461cc228@default(draft) bk:[] More addition |
| 214 | | 214 | |
| 215 | o 17:4754d61bc2db@default(draft) bk:[] More addition | 215 | o 17:4754d61bc2db@default(draft) bk:[] More addition |
| 216 |/ | 216 |/ |
| 217 | o 14:eeeb8f6e7648@default(draft) bk:[] bumped update to e3183e9c0961: | 217 | o 14:503ef784bae6@default(draft) bk:[] bumped update to e3183e9c0961: |
| 218 | | | 218 | | |
| 219 o | 9:355c5cda4de1@default(draft) bk:[] add c | 219 o | 9:355c5cda4de1@default(draft) bk:[] add c |
| 220 | | | 220 | | |
| 221 | o 8:e3183e9c0961@default(public) bk:[] newer a | 221 | o 8:e3183e9c0961@default(public) bk:[] newer a |
| 222 |/ | 222 |/ |
| 247 $ hg st | 247 $ hg st |
| 248 $ hg amend -d '0 0' -m 'More addition' # kill date variation XXX should be done in evolve | 248 $ hg amend -d '0 0' -m 'More addition' # kill date variation XXX should be done in evolve |
| 249 $ glog | 249 $ glog |
| 250 @ 22:ac6d600735a4@default(draft) bk:[] More addition | 250 @ 22:ac6d600735a4@default(draft) bk:[] More addition |
| 251 | | 251 | |
| 252 | o 14:eeeb8f6e7648@default(draft) bk:[] bumped update to e3183e9c0961: | 252 | o 14:503ef784bae6@default(draft) bk:[] bumped update to e3183e9c0961: |
| 253 | | | 253 | | |
| 254 o | 9:355c5cda4de1@default(draft) bk:[] add c | 254 o | 9:355c5cda4de1@default(draft) bk:[] add c |
| 255 | | | 255 | | |
| 256 | o 8:e3183e9c0961@default(public) bk:[] newer a | 256 | o 8:e3183e9c0961@default(public) bk:[] newer a |
| 257 |/ | 257 |/ |