1515 |
1515 |
1516 $ hg help config.update.check |
1516 $ hg help config.update.check |
1517 "commands.update.check" |
1517 "commands.update.check" |
1518 Determines what level of checking 'hg update' will perform before |
1518 Determines what level of checking 'hg update' will perform before |
1519 moving to a destination revision. Valid values are "abort", "none", |
1519 moving to a destination revision. Valid values are "abort", "none", |
1520 "linear", and "noconflict". "abort" always fails if the working |
1520 "linear", and "noconflict". |
1521 directory has uncommitted changes. "none" performs no checking, and |
1521 |
1522 may result in a merge with uncommitted changes. "linear" allows any |
1522 - "abort" always fails if the working directory has uncommitted |
1523 update as long as it follows a straight line in the revision history, |
1523 changes. |
1524 and may trigger a merge with uncommitted changes. "noconflict" will |
1524 - "none" performs no checking, and may result in a merge with |
1525 allow any update which would not trigger a merge with uncommitted |
1525 uncommitted changes. |
1526 changes, if any are present. (default: "linear") |
1526 - "linear" allows any update as long as it follows a straight line in |
|
1527 the revision history, and may trigger a merge with uncommitted |
|
1528 changes. |
|
1529 - "noconflict" will allow any update which would not trigger a merge |
|
1530 with uncommitted changes, if any are present. |
|
1531 |
|
1532 (default: "linear") |
1527 |
1533 |
1528 |
1534 |
1529 $ hg help config.commands.update.check |
1535 $ hg help config.commands.update.check |
1530 "commands.update.check" |
1536 "commands.update.check" |
1531 Determines what level of checking 'hg update' will perform before |
1537 Determines what level of checking 'hg update' will perform before |
1532 moving to a destination revision. Valid values are "abort", "none", |
1538 moving to a destination revision. Valid values are "abort", "none", |
1533 "linear", and "noconflict". "abort" always fails if the working |
1539 "linear", and "noconflict". |
1534 directory has uncommitted changes. "none" performs no checking, and |
1540 |
1535 may result in a merge with uncommitted changes. "linear" allows any |
1541 - "abort" always fails if the working directory has uncommitted |
1536 update as long as it follows a straight line in the revision history, |
1542 changes. |
1537 and may trigger a merge with uncommitted changes. "noconflict" will |
1543 - "none" performs no checking, and may result in a merge with |
1538 allow any update which would not trigger a merge with uncommitted |
1544 uncommitted changes. |
1539 changes, if any are present. (default: "linear") |
1545 - "linear" allows any update as long as it follows a straight line in |
|
1546 the revision history, and may trigger a merge with uncommitted |
|
1547 changes. |
|
1548 - "noconflict" will allow any update which would not trigger a merge |
|
1549 with uncommitted changes, if any are present. |
|
1550 |
|
1551 (default: "linear") |
1540 |
1552 |
1541 |
1553 |
1542 $ hg help config.ommands.update.check |
1554 $ hg help config.ommands.update.check |
1543 abort: help section not found: config.ommands.update.check |
1555 abort: help section not found: config.ommands.update.check |
1544 [10] |
1556 [10] |