Mercurial > evolve
comparison tests/test-evolve.t @ 477:fded4d945f87
merge with stable improvement
| author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
|---|---|
| date | Tue, 21 Aug 2012 12:47:50 +0200 |
| parents | a2dfe82f27a0 f17a0f801e0b |
| children | 4e0f1aae8d24 |
comparison
equal
deleted
inserted
replaced
| 473:1f8f8dd75d18 | 477:fded4d945f87 |
|---|---|
| 228 | 228 |
| 229 $ hg up feature-A -q | 229 $ hg up feature-A -q |
| 230 $ hg bookmark -i feature-A | 230 $ hg bookmark -i feature-A |
| 231 $ sed -i'' -e s/Eins/Un/ main-file-1 | 231 $ sed -i'' -e s/Eins/Un/ main-file-1 |
| 232 | 232 |
| 233 (amend of public changeset denied) | |
| 234 | |
| 235 $ hg phase --public 0 -v | |
| 236 phase changed for 1 changesets | |
| 237 $ hg amend -c 2 | |
| 238 abort: cannot amend non ancestor changeset | |
| 239 [255] | |
| 240 | |
| 241 | |
| 242 (amend of on ancestors) | |
| 243 | |
| 244 $ hg amend -c 2 | |
| 245 abort: cannot amend non ancestor changeset | |
| 246 [255] | |
| 247 | |
| 233 $ hg amend --note 'french looks better' | 248 $ hg amend --note 'french looks better' |
| 234 1 new unstables changesets | 249 1 new unstables changesets |
| 235 $ hg log | 250 $ hg log |
| 236 6 feature-A: a nifty feature - test | 251 6 feature-A: a nifty feature - test |
| 237 4 feature-B: another feature - test | 252 4 feature-B: another feature - test |
| 249 | | | | 264 | | | |
| 250 | | x 2:7b36850622b2@default(draft) another feature | 265 | | x 2:7b36850622b2@default(draft) another feature |
| 251 | |/ | 266 | |/ |
| 252 | x 1:568a468b60fc@default(draft) a nifty feature | 267 | x 1:568a468b60fc@default(draft) a nifty feature |
| 253 |/ | 268 |/ |
| 254 @ 0:e55e0562ee93@default(draft) base | 269 @ 0:e55e0562ee93@default(public) base |
| 255 | 270 |
| 256 $ hg debugobsolete | 271 $ hg debugobsolete |
| 257 524e478d4811d405c8771e4c441de4483bdf8b33 f8111a076f0975cbecb336e2bd3411be22b673fb 0 {'date': '* *', 'user': 'test'} (glob) | 272 524e478d4811d405c8771e4c441de4483bdf8b33 f8111a076f0975cbecb336e2bd3411be22b673fb 0 {'date': '* *', 'user': 'test'} (glob) |
| 258 7b36850622b2fd159fa30a4fb2a1edd2043b4a14 f8111a076f0975cbecb336e2bd3411be22b673fb 0 {'date': '* *', 'user': 'test'} (glob) | 273 7b36850622b2fd159fa30a4fb2a1edd2043b4a14 f8111a076f0975cbecb336e2bd3411be22b673fb 0 {'date': '* *', 'user': 'test'} (glob) |
| 259 e416e48b27428695d00c2a2cc4a0b9619482e63f 23409eba69a0986e90cd42252852c1e6da97af5b 0 {'date': '* *', 'user': 'test'} (glob) | 274 e416e48b27428695d00c2a2cc4a0b9619482e63f 23409eba69a0986e90cd42252852c1e6da97af5b 0 {'date': '* *', 'user': 'test'} (glob) |