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>
Sat, 06 Oct 2007 15:30:15 -0300
changeset 5403 477136fa6571
parent 2976 61fcd9fac434
permissions -rwxr-xr-x
Always copy the necessary files before applying a git patch This patch removes the "copymod" attribute from the gitpatch class. AFAICS, that attribute was only used to delay the copying of renamed/copied files if there are no other changes to the target, but in this case, if there are changes to the source, we'll end up copying the wrong version. This should fix issue762.
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