Mercurial Mercurial > hg / 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.out
author Vsevolod Solovyov <vsevolod.solovyov@gmail.com>
Tue, 24 Mar 2009 23:28:55 +0000
changeset 7971 6ea0318daf75
parent 7627 fb32ae9c76e7
child 9110 561ff8d9e4f0
permissions -rw-r--r--
Fix issue1495, corner case of adding empty files via patching
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
7296
695383442347 mq: put qnew tests into own file, fold in qnew-twice
Brendan Cully <brendan@kublai.com>
parents: 2714
diff changeset 
     1
 
adding a
695383442347 mq: put qnew tests into own file, fold in qnew-twice
Brendan Cully <brendan@kublai.com>
parents: 2714
diff changeset 
     2
 
% qnew should refuse bad patch names
695383442347 mq: put qnew tests into own file, fold in qnew-twice
Brendan Cully <brendan@kublai.com>
parents: 2714
diff changeset 
     3
 
abort: "series" cannot be used as the name of a patch
695383442347 mq: put qnew tests into own file, fold in qnew-twice
Brendan Cully <brendan@kublai.com>
parents: 2714
diff changeset 
     4
 
abort: "status" cannot be used as the name of a patch
695383442347 mq: put qnew tests into own file, fold in qnew-twice
Brendan Cully <brendan@kublai.com>
parents: 2714
diff changeset 
     5
 
abort: "guards" cannot be used as the name of a patch
695383442347 mq: put qnew tests into own file, fold in qnew-twice
Brendan Cully <brendan@kublai.com>
parents: 2714
diff changeset 
     6
 
abort: ".hgignore" cannot be used as the name of a patch
695383442347 mq: put qnew tests into own file, fold in qnew-twice
Brendan Cully <brendan@kublai.com>
parents: 2714
diff changeset 
     7
 
% qnew with uncommitted changes
695383442347 mq: put qnew tests into own file, fold in qnew-twice
Brendan Cully <brendan@kublai.com>
parents: 2714
diff changeset 
     8
 
abort: local changes found, refresh first
695383442347 mq: put qnew tests into own file, fold in qnew-twice
Brendan Cully <brendan@kublai.com>
parents: 2714
diff changeset 
     9
 
A somefile
695383442347 mq: put qnew tests into own file, fold in qnew-twice
Brendan Cully <brendan@kublai.com>
parents: 2714
diff changeset 
    10
 
% qnew implies add
695383442347 mq: put qnew tests into own file, fold in qnew-twice
Brendan Cully <brendan@kublai.com>
parents: 2714
diff changeset 
    11
 
A .hgignore
695383442347 mq: put qnew tests into own file, fold in qnew-twice
Brendan Cully <brendan@kublai.com>
parents: 2714
diff changeset 
    12
 
A series
695383442347 mq: put qnew tests into own file, fold in qnew-twice
Brendan Cully <brendan@kublai.com>
parents: 2714
diff changeset 
    13
 
A test.patch
695383442347 mq: put qnew tests into own file, fold in qnew-twice
Brendan Cully <brendan@kublai.com>
parents: 2714
diff changeset 
    14
 
% qnew missing
695383442347 mq: put qnew tests into own file, fold in qnew-twice
Brendan Cully <brendan@kublai.com>
parents: 2714
diff changeset 
    15
 
abort: missing: No such file or directory
695383442347 mq: put qnew tests into own file, fold in qnew-twice
Brendan Cully <brendan@kublai.com>
parents: 2714
diff changeset 
    16
 
% qnew -m
695383442347 mq: put qnew tests into own file, fold in qnew-twice
Brendan Cully <brendan@kublai.com>
parents: 2714
diff changeset 
    17
 
foo bar
7614
f9fcb189c8e2 mq: make qnew patch format consistent with qrefresh (issue1457)
Bernhard Leiner <bleiner@gmail.com>
parents: 7297
diff changeset 
    18
 







7296






695383442347
mq: put qnew tests into own file, fold in qnew-twice



Brendan Cully <brendan@kublai.com>


parents: 
2714

diff
changeset




    19


% qnew twice








2711






ca97be5babf8
mq: do not allow to qnew a patch twice



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    20


abort: patch "first.patch" already exists








2714






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



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
2711

diff
changeset




    21


abort: patch "first.patch" already exists








7297






bd6deb7525f4
mq: use cmdutil.matchfiles instead of match for qnew -f.



Brendan Cully <brendan@kublai.com>


parents: 
7296

diff
changeset




    22


% qnew -f from a subdirectory








7627






fb32ae9c76e7
mq: lowercase output



Martin Geisler <mg@daimi.au.dk>


parents: 
7614

diff
changeset




    23


patch queue now empty








7297






bd6deb7525f4
mq: use cmdutil.matchfiles instead of match for qnew -f.



Brendan Cully <brendan@kublai.com>


parents: 
7296

diff
changeset




    24


adding d/b













bd6deb7525f4
mq: use cmdutil.matchfiles instead of match for qnew -f.



Brendan Cully <brendan@kublai.com>


parents: 
7296

diff
changeset




    25


M d/b













bd6deb7525f4
mq: use cmdutil.matchfiles instead of match for qnew -f.



Brendan Cully <brendan@kublai.com>


parents: 
7296

diff
changeset




    26


diff --git a/d/b b/d/b













bd6deb7525f4
mq: use cmdutil.matchfiles instead of match for qnew -f.



Brendan Cully <brendan@kublai.com>


parents: 
7296

diff
changeset




    27


--- a/d/b













bd6deb7525f4
mq: use cmdutil.matchfiles instead of match for qnew -f.



Brendan Cully <brendan@kublai.com>


parents: 
7296

diff
changeset




    28


+++ b/d/b













bd6deb7525f4
mq: use cmdutil.matchfiles instead of match for qnew -f.



Brendan Cully <brendan@kublai.com>


parents: 
7296

diff
changeset




    29


@@ -1,1 +1,2 @@













bd6deb7525f4
mq: use cmdutil.matchfiles instead of match for qnew -f.



Brendan Cully <brendan@kublai.com>


parents: 
7296

diff
changeset




    30


 b













bd6deb7525f4
mq: use cmdutil.matchfiles instead of match for qnew -f.



Brendan Cully <brendan@kublai.com>


parents: 
7296

diff
changeset




    31


+b















Mercurial