Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-simple-update @ 5440:f9b0e4f023c4
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 | ad3d5b4367cb |
children |
rev | line source |
---|---|
544
3d4d5f2aba9a
Remove bashisms and use /bin/sh instead of /bin/bash.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
485
diff
changeset
|
1 #!/bin/sh |
331 | 2 |
800
ec85f9e6f3b1
Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
749
diff
changeset
|
3 set -e |
331 | 4 |
5 mkdir test | |
6 cd test | |
7 echo foo>foo | |
8 hg init | |
9 hg addremove | |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
547
diff
changeset
|
10 hg commit -m "1" |
331 | 11 hg verify |
12 | |
485 | 13 hg clone . ../branch |
14 cd ../branch | |
331 | 15 hg co |
16 echo bar>>foo | |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
547
diff
changeset
|
17 hg commit -m "2" |
331 | 18 |
19 cd ../test | |
20 hg pull ../branch | |
21 hg verify | |
22 hg co | |
23 cat foo | |
3736 | 24 hg manifest --debug |