facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-12-26 22:47:26 +03:00
Code Issues Projects Releases Wiki Activity

tests: add histedit test with simple reorder

Browse Source 
Summary: Debugging an issue where watchman returns a state error during histedit.

Reviewed By: quark-zju

Differential Revision: D20785858

fbshipit-source-id: 5baf762d1a5588573df9d01c63a24e751e04a811
This commit is contained in:
Stefan Filip 2020-04-01 14:00:27 -07:00 committed by Facebook GitHub Bot
parent 08b6ed4b41
commit 325fed7e50
1 changed files with 71 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
eden/scm/tests/test-histedit-reorder.t Normal file
View File

@ -0,0 +1,71 @@
#require fsmonitor
$ . "$TESTDIR/histedit-helpers.sh"
$ enable histedit fsmonitor rebase hgevents sparse
$ setconfig fsmonitor.warn-fresh-instance=true
$ newrepo
$ hg status --debug
warning: watchman has recently started (pid *) - operation will be slower than usual (glob)
poststatusfixup decides to wait for wlock since watchman reported fresh instance
$ drawdag << 'EOS'
> D
> |
> C
> |
> B
> |
> A
> EOS
$ hg log --graph
o changeset: 3:f585351a92f8
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: D
|
o changeset: 2:26805aba1e60
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: C
|
o changeset: 1:112478962961
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: B
|
o changeset: 0:426bada5c675
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: A
$ hg sparse include B C D
$ hg co $D
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg histedit 112478962961 --commands - 2>&1 << EOF | fixbundle
> pick 26805aba1e60 C
> pick 112478962961 B
> pick f585351a92f8 D
> EOF
$ hg log --graph
@ changeset: 6:ded77c342953
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: D
|
o changeset: 5:508221a61cea
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: B
|
o changeset: 4:088d21ab9b28
| parent: 0:426bada5c675
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: C
|
o changeset: 0:426bada5c675
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: A