##// END OF EJS Templates
Merge with crew-stable
Merge with crew-stable

File last commit:

r10114:3e7663b2 stable
r10180:a9f60014 merge default
Show More
test-mq-qnew.out
47 lines | 1.2 KiB | text/plain | TextLexer
Brendan Cully
mq: put qnew tests into own file, fold in qnew-twice
r7296 adding a
% qnew should refuse bad patch names
abort: "series" cannot be used as the name of a patch
abort: "status" cannot be used as the name of a patch
abort: "guards" cannot be used as the name of a patch
abort: ".hgignore" cannot be used as the name of a patch
% qnew with uncommitted changes
abort: local changes found, refresh first
A somefile
% qnew implies add
A .hgignore
A series
A test.patch
% qnew missing
abort: missing: No such file or directory
% qnew -m
foo bar
Bernhard Leiner
mq: make qnew patch format consistent with qrefresh (issue1457)
r7614
Brendan Cully
mq: put qnew tests into own file, fold in qnew-twice
r7296 % qnew twice
abort: patch "first.patch" already exists
abort: patch "first.patch" already exists
Brendan Cully
mq: use cmdutil.matchfiles instead of match for qnew -f....
r7297 % qnew -f from a subdirectory
Mads Kiilerich
mq: qpop now tells which patches are popped...
r9110 popping first.patch
popping mtest.patch
popping test.patch
Martin Geisler
mq: lowercase output...
r7627 patch queue now empty
Brendan Cully
mq: use cmdutil.matchfiles instead of match for qnew -f....
r7297 adding d/b
M d/b
diff --git a/d/b b/d/b
--- a/d/b
+++ b/d/b
@@ -1,1 +1,2 @@
b
+b
Martin Geisler
mq: do not call ui.username unless it is necessary...
r9733 % qnew -u with no username configured
From: blue
timeless
mq: qnew -f should reject merge working directories
r10114 % fail when trying to import a merge
adding a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
merging a
warning: conflicts during merge.
merging a failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
abort: cannot manage merge changesets