Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-tags @ 862:d70c1c31fd45
Fix 3-way-merge of original parent, workdir and new parent.
The dirstate has to match what is in the repository (what would be
checked out with 'hg update -C'), because the resulting file may be
identical to the new parent, or it may be completely different.
Previously the dirstate wasn't updated, so if you changed the file to
look like the original parent, it might be considered unmodified
relative to the new parent.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Wed, 10 Aug 2005 06:47:46 +0100 |
parents | 0902ffece4b4 |
children | 5a034646e472 |
line wrap: on
line source
#!/bin/sh mkdir t cd t hg init hg id echo a > a hg add a hg commit -m "test" -d "0 0" hg co hg identify T=`hg -q tip | cut -d : -f 2` echo "$T first" > .hgtags cat .hgtags hg add .hgtags hg commit -m "add tags" -d "0 0" hg tags hg identify echo bb > a hg status hg identify hg co first hg id hg -v id hg status echo 1 > b hg add b hg commit -m "branch" -d "0 0" hg id hg co -m 1 hg id hg status