mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 15:27:13 +03:00
66b64d8fb6
Summary: Instead of referencing `hg rebase` --restack option, just reference the `restack` subcommand. Test Plan: 1. Make a few commits 1, 2, 3, 4 on any branch 2. `hg update 1` 3. Try to amend commit 1 4. Warning message should appear about children left behind expected: Hint text does not mention `hg rebase --restack` Reviewers: durham, kulshrax Reviewed By: kulshrax Subscribers: medson, mjpieters, kkrewink Differential Revision: https://phabricator.intern.facebook.com/D5313108 Tasks: 19601780 Signature: t1:5313108:1498249314:98f31f4424341ef51997687293bf99b7297b6cd0
20 lines
532 B
Perl
20 lines
532 B
Perl
Set up test environment.
|
|
$ cat >> $HGRCPATH << EOF
|
|
> [extensions]
|
|
> fbamend=$TESTDIR/../hgext3rd/fbamend
|
|
> rebase=
|
|
> [experimental]
|
|
> evolution = createmarkers
|
|
> EOF
|
|
$ hg init repo && cd repo
|
|
|
|
Perform restack without inhibit extension.
|
|
$ hg debugbuilddag -m +3
|
|
$ hg update 1
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hg amend -m "Amended"
|
|
warning: the changeset's children were left behind
|
|
(use 'hg restack' to rebase them)
|
|
$ hg rebase --restack
|
|
rebasing 2:* "r2" (glob)
|