Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-update-reverse @ 5429:77cafe8f89e0
findcopies: fix rename bug
We've fiddled with this line several times, and an old bug has
reappeared from it. Let's take a peek at the history.
The original "or" (rev 3674, in 0.9.2 and 0.9.3):
http://www.selenic.com/hg/rev/9103dab96093
Then I changed it to an "and" to fix a bug (rev 4304):
http://www.selenic.com/hg/rev/4787e2b0dd03
Then for reasons now lost in the mists of time, I dropped half (rev 4399):
http://www.selenic.com/hg/rev/93652499bed3
Then we added back the "or" (rev 4416, in 0.9.4):
http://www.selenic.com/hg/rev/bb1800a7d7e1
So it seems it ought to be "and".
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 08 Oct 2007 18:47:22 -0500 |
parents | 7544700fd931 |
children |
line wrap: on
line source
#!/bin/sh hg init touch a hg add a hg commit -m "Added a" -d "1000000 0" touch main hg add main hg commit -m "Added main" -d "1000000 0" hg checkout 0 echo Main should be gone ls touch side1 hg add side1 hg commit -m "Added side1" -d "1000000 0" touch side2 hg add side2 hg commit -m "Added side2" -d "1000000 0" hg log echo Should have two heads, side2 and main hg heads echo Should show "a side1 side2" ls hg update --debug -C 1 echo Should only show "a main" ls