Mercurial > hg
diff tests/test-push-warn @ 10908:816bac2f9452 stable
prepush: fix bug in warning message selection
In certain situations you would be told "you should pull and merge" even when
there is nothing to pull.
| author | Sune Foldager <cryo@cyanite.org> |
|---|---|
| date | Wed, 14 Apr 2010 19:11:35 +0200 |
| parents | a9702c47a19f |
| children | 29a83fb8c067 |
line wrap: on
line diff
--- a/tests/test-push-warn Wed Apr 14 00:24:47 2010 -0500 +++ b/tests/test-push-warn Wed Apr 14 19:11:35 2010 +0200 @@ -56,15 +56,15 @@ hg push -r 3 -r 4 ../c; echo $? hg push -f -r 3 -r 4 ../c; echo $? hg push -r 5 ../c; echo $? +hg in ../c -# issue 450 +echo % issue 450 hg init ../e hg push -r 0 ../e ; echo $? hg push -r 1 ../e ; echo $? cd .. -# issue 736 echo % issue 736 hg init f cd f