mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 08:47:12 +03:00
7f3e8286a8
Summary: cmdutil.amend was changed recently to get rid of the redundant commit during the amend operation. As a result, we need to update the tests which were aware of the redundant commit. This commit achieves the same. Note that as a result of the amend behavior change, the dirsync and copytrace extensions were broken. They will be be fixed in subsequent commits on top of this commit. For now, the broken tests for these extensions were removed from the commit. Eventually, I will fold all the fixes together so that revision history of the tests is not messed up. This is primarily done only to aid the review. Test Plan: Ran the test suite after updating the tests.
35 lines
863 B
Perl
35 lines
863 B
Perl
$ cat >> $HGRCPATH << EOF
|
|
> [extensions]
|
|
> tweakdefaults=$TESTDIR/../hgext3rd/tweakdefaults.py
|
|
> fbamend=$TESTDIR/../hgext3rd/fbamend
|
|
> rebase=
|
|
> [experimental]
|
|
> evolution=createmarkers
|
|
> EOF
|
|
|
|
Setup repo
|
|
$ hg init opawarerepo
|
|
$ cd opawarerepo
|
|
$ echo root > root && hg ci -Am root
|
|
adding root
|
|
|
|
Check amend metadata
|
|
$ echo a > a && hg ci -Am a
|
|
adding a
|
|
$ echo aa > a && hg amend
|
|
$ hg debugobsolete
|
|
.* {'operation': 'amend', 'user': 'test'} (re)
|
|
|
|
Check rebase metadata
|
|
$ hg book -r . destination
|
|
$ hg up 0
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
$ echo b > b && hg ci -Am b
|
|
adding b
|
|
created new head
|
|
$ hg rebase -r . -d destination
|
|
rebasing 3:1e9a3c00cbe9 "b" (tip)
|
|
$ hg debugobsolete
|
|
.* {'operation': 'amend', 'user': 'test'} (re)
|
|
.* {'operation': 'rebase', 'user': 'test'} (re)
|