Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-diff-binary-file @ 5335:88e931f74e8b
convert_git: avoid returning two entries for the same file in getchanges
This could happen in merge changesets if the merged file was different
from both parents.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Mon, 24 Sep 2007 19:00:11 -0300 |
parents | 0934fef871f3 |
children |
line wrap: on
line source
#!/bin/sh hg init a cd a cp $TESTDIR/binfile.bin . hg add binfile.bin hg ci -m 'add binfile.bin' -d '0 0' echo >> binfile.bin hg ci -m 'change binfile.bin' -d '0 0' hg revert -r 0 binfile.bin hg ci -m 'revert binfile.bin' -d '0 0' echo % diff -r 0 -r 1 hg diff --nodates -r 0 -r 1 echo % diff -r 0 -r 2 hg diff --nodates -r 0 -r 2 echo % diff --git -r 0 -r 1 hg diff --git -r 0 -r 1 echo % diff --git -r 0 -r 2 hg diff --git -r 0 -r 2