Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-confused-revert @ 1712:21dcf38e5d7d
Allow callers to pass in the dirstate lock in most localrepo.py funcs.
This makes it possible to take the lock once and commit a large number of
patches, without having to read and write the dirstate for each patch.
author | mason@suse.com |
---|---|
date | Thu, 09 Feb 2006 17:18:43 -0600 |
parents | 30146be3437c |
children | 7544700fd931 |
line wrap: on
line source
#!/bin/sh hg init echo foo > a hg add a hg commit -m "1" -d "0 0" echo bar > b hg add b hg remove a echo "%%% should show a removed and b added" hg status echo "reverting..." hg revert echo "%%% should show b unknown and a back to normal" hg status rm b hg co -C 0 echo foo-a > a hg commit -m "2a" -d "0 0" hg co -C 0 echo foo-b > a hg commit -m "2b" -d "0 0" HGMERGE=true hg update -m 1 echo "%%% should show foo-b" cat a echo bar > b hg add b rm a hg remove a echo "%%% should show a removed and b added" hg status echo "reverting..." hg revert echo "%%% should show b unknown and a marked modified (merged)" hg status echo "%%% should show foo-b" cat a