##// END OF EJS Templates
dirstate: add a test to highlight another changelog / dirstate race
Arseniy Alekseyev -
r51249:08f38750 stable
parent child Browse files
Show More
@@ -1430,3 +1430,42 b' HGPLAIN setting in hooks'
1430 ### no ######## plain: <unset>
1430 ### no ######## plain: <unset>
1431 ### auto ###### plain: 1
1431 ### auto ###### plain: 1
1432 Mercurial Distributed SCM (*) (glob)
1432 Mercurial Distributed SCM (*) (glob)
1433
1434 Test hook that change the underlying repo
1435 =========================================
1436
1437 blackbox access the dirstate afterward and can see a changelog / dirstate
1438 desync.
1439
1440
1441 $ cd $TESTTMP
1442 $ cat <<EOF >> $HGRCPATH
1443 > [extensions]
1444 > blackbox=
1445 > [hooks]
1446 > post-merge = hg commit -m "auto merge"
1447 > EOF
1448
1449 $ hg init t
1450 $ cd t
1451 $ touch ".hgignore"
1452 $ hg commit -Am "initial" -d'0 0'
1453 adding .hgignore
1454
1455 $ echo This is file a1 > a
1456 $ hg commit -Am "commit #1" -d'0 0'
1457 adding a
1458
1459 $ hg update 0
1460 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1461 $ echo This is file b1 > b
1462 $ hg commit -Am "commit #2" -d'0 0'
1463 adding b
1464 created new head
1465
1466 $ hg merge 1
1467 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1468 (branch merge, don't forget to commit)
1469 warning: ignoring unknown working parent 449f60fb3fe2! (known-bad-output !)
1470
1471 $ cd ..
General Comments 0
You need to be logged in to leave comments. Login now