##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

Do not use osutil.c with python 2.4 and Windows (issue1364)...
Do not use osutil.c with python 2.4 and Windows (issue1364) Windows python 2.4 os.stat() reports times including DST offset, while osutil.c reports the correct value, which makes status() systematically compare files content. This bug is fixed in python 2.5. Using osutil.py instead of osutil.c is 4x times slower on large repositories but current code is completely unusable. Given few people are likely to use python 2.4 on Windows this solution was considered a good trade-off compared to more invasive solutions trying to address the offset issue.
Steve Losh - - Load All Authors

File last commit:

r10397:8cb81d75 default
r10521:bde1bb25 stable
Show More
test-mq-qnew.out
99 lines | 2.4 KiB | text/plain | TextLexer
/ tests / test-mq-qnew.out
History | Source | Raw |Copy content |Copy permalink
Steve Losh
mq: add parent node IDs to MQ patches on qrefresh/qnew...
 r10397 %%% plain headers
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
Augie Fackler
qnew: ignore force option...
 r10372 uncommitted.patch
Brendan Cully
mq: put qnew tests into own file, fold in qnew-twice
 r7296 % qnew implies add
A .hgignore
A series
Augie Fackler
qnew: ignore force option...
 r10372 A uncommitted.patch
Brendan Cully
mq: put qnew tests into own file, fold in qnew-twice
 r7296 % 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
Augie Fackler
qnew: ignore force option...
 r10372 popping uncommitted.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
Steve Losh
mq: add parent node IDs to MQ patches on qrefresh/qnew...
 r10397 %%% hg headers
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
uncommitted.patch
% qnew implies add
A .hgignore
A series
A uncommitted.patch
% qnew missing
abort: missing: No such file or directory
% qnew -m
# HG changeset patch
# Parent
foo bar
% qnew twice
abort: patch "first.patch" already exists
abort: patch "first.patch" already exists
% qnew -f from a subdirectory
popping first.patch
popping mtest.patch
popping uncommitted.patch
patch queue now empty
adding d/b
M d/b
# HG changeset patch
# Parent
diff --git a/d/b b/d/b
--- a/d/b
+++ b/d/b
@@ -1,1 +1,2 @@
b
+b
% qnew -u with no username configured
# HG changeset patch
# Parent
# User blue
% 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