Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge-revert2 @ 1630:5ecf05541e11
This fixes a bug that Chris Mason found. As for a test case, I can't
think of one. It's a very weird case. Basically, if there is a file
listed as changed in the changelog entry, but not showing up in any
of the associated manifest entries, hg would abort when trying to
create a changeset. Now it just decides the file must not have any
versions relevant to the changeset.
author | Eric Hopper <hopper@omnifarious.org> |
---|---|
date | Fri, 20 Jan 2006 09:35:43 -0800 |
parents | 4f81068ed8cd |
children | 7544700fd931 |
line wrap: on
line source
#!/bin/sh mkdir t cd t hg init echo "added file1" > file1 echo "another line of text" >> file1 echo "added file2" > file2 hg add file1 file2 hg commit -m "added file1 and file2" -d "0 0" -u user echo "changed file1" >> file1 hg commit -m "changed file1" -d "0 0" -u user hg -q log hg id hg update -C 0 hg id echo "changed file1" >> file1 hg id hg revert hg diff hg status hg id hg update hg diff hg status hg id hg update -C 0 echo "changed file1 different" >> file1 HGMERGE=merge hg update hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" -e "s/\(<<<<<<<\) .*/\1/" \ -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" -e "s/\(>>>>>>>\) .*/\1/" hg status hg id hg revert hg diff hg status hg id hg revert -r tip hg diff hg status hg id hg update -C hg diff hg status hg id cd ..; /bin/rm -rf t