Mercurial > evolve
comparison tests/test-split.t @ 1485:1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Before this patch we were leaving the bookmarks on the precursor of the split
instead of moving them on the tip of the split chain. We add a test to verify
the behavior.
| author | Laurent Charignon <lcharignon@fb.com> |
|---|---|
| date | Sat, 08 Aug 2015 12:42:57 -0700 |
| parents | e3484e9632cd |
| children | 2a08ef812b84 |
comparison
equal
deleted
inserted
replaced
| 1484:e3484e9632cd | 1485:1ba64be11bf8 |
|---|---|
| 244 user: test | 244 user: test |
| 245 date: Thu Jan 01 00:00:00 1970 +0000 | 245 date: Thu Jan 01 00:00:00 1970 +0000 |
| 246 summary: add _a | 246 summary: add _a |
| 247 | 247 |
| 248 | 248 |
| 249 Split should move bookmarks on the last split successor and preserve the | |
| 250 active bookmark as active | |
| 251 $ hg book bookA | |
| 252 $ hg book bookB | |
| 253 $ echo "changetofilea" > _a | |
| 254 $ hg amend | |
| 255 $ hg book | |
| 256 bookA 17:39d16b69c75d | |
| 257 * bookB 17:39d16b69c75d | |
| 258 $ hg glog -r "14::" | |
| 259 @ changeset: 17:39d16b69c75d | |
| 260 | bookmark: bookA | |
| 261 | bookmark: bookB | |
| 262 | tag: tip | |
| 263 | parent: 14:aec57822a8ff | |
| 264 | user: test | |
| 265 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 266 | summary: split2 | |
| 267 | | |
| 268 o changeset: 14:aec57822a8ff | |
| 269 | user: test | |
| 270 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 271 | summary: split1 | |
| 272 | | |
| 273 $ hg split <<EOF | |
| 274 > y | |
| 275 > y | |
| 276 > n | |
| 277 > y | |
| 278 > EOF | |
| 279 (leaving bookmark bookB) | |
| 280 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
| 281 reverting _a | |
| 282 adding _d | |
| 283 diff --git a/_a b/_a | |
| 284 1 hunks, 2 lines changed | |
| 285 examine changes to '_a'? [Ynesfdaq?] y | |
| 286 | |
| 287 @@ -1,2 +1,1 @@ | |
| 288 -_a | |
| 289 -change to a | |
| 290 +changetofilea | |
| 291 record change 1/2 to '_a'? [Ynesfdaq?] y | |
| 292 | |
| 293 diff --git a/_d b/_d | |
| 294 new file mode 100644 | |
| 295 examine changes to '_d'? [Ynesfdaq?] n | |
| 296 | |
| 297 created new head | |
| 298 Done splitting? [yN] y | |
| 299 $ hg glog -r "14::" | |
| 300 @ changeset: 19:a2b5c9d9b362 | |
| 301 | bookmark: bookA | |
| 302 | bookmark: bookB | |
| 303 | tag: tip | |
| 304 | user: test | |
| 305 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 306 | summary: split6 | |
| 307 | | |
| 308 o changeset: 18:bf3402785e72 | |
| 309 | parent: 14:aec57822a8ff | |
| 310 | user: test | |
| 311 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 312 | summary: split5 | |
| 313 | | |
| 314 o changeset: 14:aec57822a8ff | |
| 315 | user: test | |
| 316 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 317 | summary: split1 | |
| 318 | | |
| 319 $ hg book | |
| 320 bookA 19:a2b5c9d9b362 | |
| 321 * bookB 19:a2b5c9d9b362 | |
| 322 | |
| 249 Cannot specify multiple revisions with -r | 323 Cannot specify multiple revisions with -r |
| 250 $ hg split -r "desc(_a)::" | 324 $ hg split -r "desc(_a)::" |
| 251 abort: you can only specify one revision to split | 325 abort: you can only specify one revision to split |
| 252 [255] | 326 [255] |
| 253 | 327 |