equal
deleted
inserted
replaced
2607 ] + commitopts + commitopts2, |
2607 ] + commitopts + commitopts2, |
2608 _('hg fold [OPTION]... [-r] REV')) |
2608 _('hg fold [OPTION]... [-r] REV')) |
2609 def fold(ui, repo, *revs, **opts): |
2609 def fold(ui, repo, *revs, **opts): |
2610 """fold multiple revisions into a single one |
2610 """fold multiple revisions into a single one |
2611 |
2611 |
2612 Folds a set of revisions with the parent of the working directory. |
2612 By default, folds all the revisions linearly between the given revisions |
2613 All revisions linearly between the given revisions and the parent |
2613 and the parent of the working directory. |
2614 of the working directory will also be folded. |
|
2615 |
2614 |
2616 Use --exact for folding only the specified revisions while ignoring the |
2615 Use --exact for folding only the specified revisions while ignoring the |
2617 parent of the working directory. In this case, the given revisions must |
2616 parent of the working directory. In this case, the given revisions must |
2618 form a linear unbroken chain. |
2617 form a linear unbroken chain. |
2619 |
2618 |
2633 :hg:`help revsets` for more about the `draft()` keyword |
2632 :hg:`help revsets` for more about the `draft()` keyword |
2634 |
2633 |
2635 - Fold revisions 3, 4, 5, and 6 with the working directory parent:: |
2634 - Fold revisions 3, 4, 5, and 6 with the working directory parent:: |
2636 |
2635 |
2637 hg fold 3:6 |
2636 hg fold 3:6 |
|
2637 |
|
2638 - Fold revisions 3 and 4: |
|
2639 |
|
2640 hg fold "3 + 4" --exact |
2638 |
2641 |
2639 - Only fold revisions linearly between foo and @:: |
2642 - Only fold revisions linearly between foo and @:: |
2640 |
2643 |
2641 hg fold foo::@ --exact |
2644 hg fold foo::@ --exact |
2642 """ |
2645 """ |