Mercurial > hg
view tests/test-diff-hashes @ 4884:931f901ab811
merge: fix unnecessary rename merges on linear update (issue631)
If one side's revision is identical to the ancestor, we skip the rest
of the copy detection logic.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 15 Jul 2007 14:43:38 -0500 |
parents | 2065789f6a3e |
children | c2d0ed7f4af8 |
line wrap: on
line source
#!/bin/sh hg init a cd a echo bar > foo hg add foo hg ci -m 'add foo' -d '1000000 0' echo foobar > foo hg ci -m 'change foo' -d '1000001 0' echo 'quiet:' hg --quiet diff -r 0 -r 1 echo echo 'normal:' hg diff -r 0 -r 1 echo echo 'verbose:' hg --verbose diff -r 0 -r 1 echo echo 'debug:' hg --debug diff -r 0 -r 1 echo