Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-revert @ 1798:d610fe0e6893

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgmerge: do not use file with markers in tools merging themselves This time I forgot about a crucial part of the logic change. The patch makes kdiff3 and tkdiff useful again.
author Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
date Thu, 23 Feb 2006 18:10:04 +0100
parents 2bc6cd62a29c
children 7544700fd931
line wrap: on
line source

#!/bin/sh

hg init
echo 123 > a
echo 123 > c
hg add a c
hg commit -m "first" -d "0 0" a c
echo 123 > b
echo %% should show b unknown
hg status
echo 12 > c
echo %% should show b unknown and c modified
hg status
hg add b
echo %% should show b added and c modified
hg status
hg rm a
echo %% should show a removed, b added and c modified
hg status
hg revert a
echo %% should show b added and c modified
hg status
hg revert b
echo %% should show b unknown and c modified
hg status
hg revert c
echo %% should show b unknown
hg status
echo %% should show a b and c
ls

true