facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-06 23:07:18 +03:00
Code Issues Projects Releases Wiki Activity

test-merge-remove: use treestate

Browse Source 
Summary:
The test change indicates that treestate is more correct in flagging a removed
file exited in only p2.

Reviewed By: DurhamG, phillco

Differential Revision: D8842392

fbshipit-source-id: 84a8aba89a34bb52c53ff43b86dea717417dcd24
This commit is contained in:
Jun Wu 2018-07-27 17:58:18 -07:00 committed by Facebook Github Bot
parent f6532949bd
commit f237fcebc4
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/test-merge-remove.t
View File

@ -1,3 +1,4 @@
$ setconfig format.dirstate=2
$ . helpers-usechg.sh
$ hg init
@ -38,8 +39,8 @@ Removing foo1 and bar:
$ hg rm -f foo1 bar
$ hg debugstate --nodates
r 0 -1 set bar
r 0 -1 set foo1
r 0 -2 unset bar
r 0 -2 unset foo1
copy: foo -> foo1
$ hg st -qC