Mercurial Mercurial > hg > mercurial-crew-with-dirclash / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-mq-qnew-twice
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Sun, 12 Aug 2007 12:15:10 -0300
changeset 5149 ad6b97132b81
parent 2976 61fcd9fac434
permissions -rwxr-xr-x
merge: fix a copy detection bug (issue672) When merging rev1 and rev2, we want to search for copies that happened in rev1 but not in rev2 and vice-versa. We were starting the search at rev1/rev2 and then going back, stopping as soon as we reached the revno of the ancestor, but that can miss some cases (see the new test-issue672). Now we calculate the revisions that are ancestors of rev1 or rev2 (but not both) and make sure the search doesn't stop too early. Simplified test provided by mpm, based on a test case provided by Edward Lee.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2710
ca97be5babf8 mq: do not allow to qnew a patch twice
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     1
 
#!/bin/sh
ca97be5babf8 mq: do not allow to qnew a patch twice
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     2
 







2976






61fcd9fac434
Make tests append settings to $HGRCPATH instead of $HGTMP/.hgrc



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
2713

diff
changeset




     3


echo "[extensions]" >> $HGRCPATH













61fcd9fac434
Make tests append settings to $HGRCPATH instead of $HGTMP/.hgrc



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
2713

diff
changeset




     4


echo "mq=" >> $HGRCPATH








2710






ca97be5babf8
mq: do not allow to qnew a patch twice



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




     5














ca97be5babf8
mq: do not allow to qnew a patch twice



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




     6


hg init a













ca97be5babf8
mq: do not allow to qnew a patch twice



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




     7


cd a













ca97be5babf8
mq: do not allow to qnew a patch twice



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




     8


hg qnew first.patch













ca97be5babf8
mq: do not allow to qnew a patch twice



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




     9


hg qnew first.patch













ca97be5babf8
mq: do not allow to qnew a patch twice



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    10














ca97be5babf8
mq: do not allow to qnew a patch twice



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    11


touch ../first.patch













ca97be5babf8
mq: do not allow to qnew a patch twice



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    12


hg qimport ../first.patch








2713






85070b784896
Fix test-mq-qnew-twice exit code and output.



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
2710

diff
changeset




    13














85070b784896
Fix test-mq-qnew-twice exit code and output.



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
2710

diff
changeset




    14


exit 0















mercurial-crew-with-dirclash