tests/test-revert-unknown
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Tue, 18 Mar 2008 04:07:39 -0300
changeset 6297 fed1a9c22076
parent 2982 890e285c52a1
permissions -rwxr-xr-x
dirstate.remove: during merges, remember the previous file state We encode the previous state as a negative file size (AFAICS, previous versions of hg always have size == 0 when state == 'r'). We save the state of 'm'erged and dirty files, because they're the two states that indicate that a file has to be committed on a merge to correctly record per-file history.

#!/bin/sh

hg init
touch unknown

touch a
hg add a
hg ci -m "1" -d "1000000 0"

touch b
hg add b
hg ci -m "2" -d "1000000 0"

echo %% Should show unknown
hg status
hg revert -r 0 --all
echo %% Should show unknown and b removed
hg status
echo %% Should show a and unknown
ls