##// END OF EJS Templates
rebase: enable multidest by default...
Jun Wu -
r35288:3398603c default
parent child Browse files
Show More
@@ -643,6 +643,11 b' def rebase(ui, repo, **opts):'
643 4. If you do not specify any of ``--rev``, ``source``, or ``--base``,
643 4. If you do not specify any of ``--rev``, ``source``, or ``--base``,
644 rebase will use ``--base .`` as above.
644 rebase will use ``--base .`` as above.
645
645
646 If ``--source`` or ``--rev`` is used, special names ``SRC`` and ``ALLSRC``
647 can be used in ``--dest``. Destination would be calculated per source
648 revision with ``SRC`` substituted by that single source revision and
649 ``ALLSRC`` substituted by all source revisions.
650
646 Rebase will destroy original changesets unless you use ``--keep``.
651 Rebase will destroy original changesets unless you use ``--keep``.
647 It will also move your bookmarks (even if you do).
652 It will also move your bookmarks (even if you do).
648
653
@@ -691,6 +696,12 b' def rebase(ui, repo, **opts):'
691
696
692 hg rebase -r "branch(featureX)" -d 1.3 --keepbranches
697 hg rebase -r "branch(featureX)" -d 1.3 --keepbranches
693
698
699 - stabilize orphaned changesets so history looks linear::
700
701 hg rebase -r 'orphan()-obsolete()'\
702 -d 'first(max((successors(max(roots(ALLSRC) & ::SRC)^)-obsolete())::) +\
703 max(::((roots(ALLSRC) & ::SRC)^)-obsolete()))'
704
694 Configuration Options:
705 Configuration Options:
695
706
696 You can make rebase require a destination if you set the following config
707 You can make rebase require a destination if you set the following config
@@ -884,8 +895,6 b' def _definedestmap(ui, repo, destf=None,'
884 # fast path: try to resolve dest without SRC alias
895 # fast path: try to resolve dest without SRC alias
885 dest = scmutil.revsingle(repo, destf, localalias=alias)
896 dest = scmutil.revsingle(repo, destf, localalias=alias)
886 except error.RepoLookupError:
897 except error.RepoLookupError:
887 if not ui.configbool('experimental', 'rebase.multidest'):
888 raise
889 # multi-dest path: resolve dest for each SRC separately
898 # multi-dest path: resolve dest for each SRC separately
890 destmap = {}
899 destmap = {}
891 for r in rebaseset:
900 for r in rebaseset:
@@ -532,9 +532,6 b" coreconfigitem('experimental', 'mergedri"
532 coreconfigitem('experimental', 'obsmarkers-exchange-debug',
532 coreconfigitem('experimental', 'obsmarkers-exchange-debug',
533 default=False,
533 default=False,
534 )
534 )
535 coreconfigitem('experimental', 'rebase.multidest',
536 default=False,
537 )
538 coreconfigitem('experimental', 'remotenames',
535 coreconfigitem('experimental', 'remotenames',
539 default=False,
536 default=False,
540 )
537 )
@@ -115,7 +115,6 b' Setup rebase with multiple destinations'
115 > [extensions]
115 > [extensions]
116 > maprevset=$TESTTMP/maprevset.py
116 > maprevset=$TESTTMP/maprevset.py
117 > [experimental]
117 > [experimental]
118 > rebase.multidest=true
119 > evolution=true
118 > evolution=true
120 > EOF
119 > EOF
121
120
General Comments 0
You need to be logged in to leave comments. Login now