equal
deleted
inserted
replaced
1421 ### default ### plain: 1 |
1421 ### default ### plain: 1 |
1422 ### yes ####### plain: 1 |
1422 ### yes ####### plain: 1 |
1423 ### no ######## plain: <unset> |
1423 ### no ######## plain: <unset> |
1424 ### auto ###### plain: 1 |
1424 ### auto ###### plain: 1 |
1425 Mercurial Distributed SCM (*) (glob) |
1425 Mercurial Distributed SCM (*) (glob) |
|
1426 |
|
1427 Test hook that change the underlying repo |
|
1428 ========================================= |
|
1429 |
|
1430 blackbox access the dirstate afterward and can see a changelog / dirstate |
|
1431 desync. |
|
1432 |
|
1433 |
|
1434 $ cd $TESTTMP |
|
1435 $ cat <<EOF >> $HGRCPATH |
|
1436 > [extensions] |
|
1437 > blackbox= |
|
1438 > [hooks] |
|
1439 > post-merge = hg commit -m "auto merge" |
|
1440 > EOF |
|
1441 |
|
1442 $ hg init t |
|
1443 $ cd t |
|
1444 $ touch ".hgignore" |
|
1445 $ hg commit -Am "initial" -d'0 0' |
|
1446 adding .hgignore |
|
1447 |
|
1448 $ echo This is file a1 > a |
|
1449 $ hg commit -Am "commit #1" -d'0 0' |
|
1450 adding a |
|
1451 |
|
1452 $ hg update 0 |
|
1453 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1454 $ echo This is file b1 > b |
|
1455 $ hg commit -Am "commit #2" -d'0 0' |
|
1456 adding b |
|
1457 created new head |
|
1458 |
|
1459 $ hg merge 1 |
|
1460 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1461 (branch merge, don't forget to commit) |
|
1462 |
|
1463 $ cd .. |