merge: fix spurious merges for copies in linear updates
We make better use of contexts to accurately identify copies that
don't need merges.
Add a simple test and update other tests.
#!/bin/shmkdir acd ahg initecho foo > bhg add bhg ci -m "b" -d "1000000 0"chmod -w .hg/storecd ..hg clone a bchmod +w a/.hg/store # let test clean upcd bhg verify