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 Maxim Dounin <mdounin@mdounin.ru>
Sat, 27 Oct 2007 16:27:55 +0400
changeset 5483 0c43f87baba3
parent 2976 61fcd9fac434
permissions -rwxr-xr-x
Fix file-changed-to-dir and dir-to-file commits (issue660). Allow adding to dirstate files that clash with previously existing but marked for removal. Protect from reintroducing clashes by revert. This change doesn't address related issues with update. Current workaround is to do "clean" update by manually removing conflicting files/dirs from working directory.
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