mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 08:47:12 +03:00
6317ba0ca2
Summary: The functionality we care about is provided by the `fbamend` extension. Therefore, lets replace the `amend` extension with the `fbamend` extension. Reviewed By: farnz Differential Revision: D10320739 fbshipit-source-id: 5700d39f488777fcc4033f60ce0a51cda15ef2ad
34 lines
637 B
Perl
34 lines
637 B
Perl
Set up test environment.
|
|
$ cat >> $HGRCPATH << EOF
|
|
> [extensions]
|
|
> amend=
|
|
> rebase=
|
|
> [experimental]
|
|
> evolution = createmarkers, allowunstable
|
|
> EOF
|
|
|
|
Test that rebased commits that would cause instability are inhibited.
|
|
$ hg init repo && cd repo
|
|
$ hg debugbuilddag -m '+3 *3'
|
|
$ showgraph
|
|
o 3 e5d56d7a7894 r3
|
|
|
|
|
| o 2 c175bafe34cb r2
|
|
| |
|
|
| o 1 22094967a90d r1
|
|
|/
|
|
o 0 1ad88bca4140 r0
|
|
$ hg rebase -r 1 -d 3
|
|
rebasing 1:* "r1" (glob)
|
|
merging mf
|
|
$ showgraph
|
|
o 4 309a29d7f33b r1
|
|
|
|
|
o 3 e5d56d7a7894 r3
|
|
|
|
|
| o 2 c175bafe34cb r2
|
|
| |
|
|
| x 1 22094967a90d r1
|
|
|/
|
|
o 0 1ad88bca4140 r0
|