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

File last commit:

r9606:69f8ac71 default
r10180:a9f60014 merge default
Show More
test-qrecord.out
208 lines | 4.4 KiB | text/plain | TextLexer
Kirill Smelkov
qrecord: add tests
r5933 % help (no mq, so no qrecord)
hg: unknown command 'qrecord'
Mercurial Distributed SCM
basic commands:
add add the specified files on the next commit
timeless
Improve English for help text of many core hg commands....
r8779 annotate show changeset information by line for each file
Kirill Smelkov
qrecord: add tests
r5933 clone make a copy of an existing repository
commit commit the specified files or all outstanding changes
diff diff repository (or selected files)
export dump the header and diffs for one or more changesets
Steve Losh
Add a forget command for easily untracking files....
r8902 forget forget the specified files on the next commit
Kirill Smelkov
qrecord: add tests
r5933 init create a new repository in the given directory
log show revision history of entire repository or files
merge merge working directory with another revision
pull pull changes from the specified source
push push changes to the specified destination
remove remove the specified files on the next commit
serve export the repository via HTTP
status show changed files in the working directory
Matt Mackall
Introduce summary command
r9603 summary summarize working directory state
Kirill Smelkov
qrecord: add tests
r5933 update update working directory
use "hg help" for the full list of commands or "hg -v" for details
% help (mq present)
hg qrecord [OPTION]... PATCH [FILE]...
interactively record a new patch
Martin Geisler
record: wrapped docstrings at 78 characters
r9074 See 'hg help qnew' & 'hg help record' for more information and usage.
Kirill Smelkov
qrecord: add tests
r5933
options:
-e --edit edit commit message
-g --git use git extended diff format
Thomas Arendsen Hein
Adjust test output for hg help qrecord since ef14c773b3d6
r6918 -U --currentuser add "From: <current user>" to patch
-u --user add "From: <given user>" to patch
-D --currentdate add "Date: <current date>" to patch
-d --date add "Date: <given date>" to patch
Kirill Smelkov
qrecord: add tests
r5933 -I --include include names matching the given patterns
-X --exclude exclude names matching the given patterns
-m --message use <text> as commit message
-l --logfile read commit message from <file>
use "hg -v help qrecord" to show global options
% base commit
% changing files
% whole diff
diff -r 1057167b20ef 1.txt
--- a/1.txt
+++ b/1.txt
@@ -1,5 +1,5 @@
1
-2
+2 2
3
-4
+4 4
5
diff -r 1057167b20ef 2.txt
--- a/2.txt
+++ b/2.txt
@@ -1,5 +1,5 @@
a
-b
+b b
c
d
e
diff -r 1057167b20ef dir/a.txt
--- a/dir/a.txt
+++ b/dir/a.txt
@@ -1,4 +1,4 @@
-hello world
+hello world!
someone
up
% qrecord a.patch
diff --git a/1.txt b/1.txt
2 hunks, 4 lines changed
timeless@mozdev.org
record: remove superfluous space
r9461 examine changes to '1.txt'? [Ynsfdaq?] @@ -1,3 +1,3 @@
Kirill Smelkov
qrecord: add tests
r5933 1
-2
+2 2
3
timeless@mozdev.org
record: remove superfluous space
r9461 record change 1/6 to '1.txt'? [Ynsfdaq?] @@ -3,3 +3,3 @@
Kirill Smelkov
qrecord: add tests
r5933 3
-4
+4 4
5
timeless@mozdev.org
record: remove superfluous space
r9461 record change 2/6 to '1.txt'? [Ynsfdaq?] diff --git a/2.txt b/2.txt
Kirill Smelkov
qrecord: add tests
r5933 1 hunks, 2 lines changed
timeless@mozdev.org
record: remove superfluous space
r9461 examine changes to '2.txt'? [Ynsfdaq?] @@ -1,5 +1,5 @@
Kirill Smelkov
qrecord: add tests
r5933 a
-b
+b b
c
d
e
timeless@mozdev.org
record: remove superfluous space
r9461 record change 4/6 to '2.txt'? [Ynsfdaq?] diff --git a/dir/a.txt b/dir/a.txt
Kirill Smelkov
qrecord: add tests
r5933 1 hunks, 2 lines changed
timeless@mozdev.org
record: remove superfluous space
r9461 examine changes to 'dir/a.txt'? [Ynsfdaq?]
Kirill Smelkov
qrecord: add tests
r5933 % after qrecord a.patch 'tip'
changeset: 1:5d1ca63427ee
tag: qtip
tag: tip
tag: a.patch
tag: qbase
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: aaa
diff -r 1057167b20ef -r 5d1ca63427ee 1.txt
--- a/1.txt Thu Jan 01 00:00:00 1970 +0000
+++ b/1.txt Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +1,5 @@
1
-2
+2 2
3
4
5
diff -r 1057167b20ef -r 5d1ca63427ee 2.txt
--- a/2.txt Thu Jan 01 00:00:00 1970 +0000
+++ b/2.txt Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +1,5 @@
a
-b
+b b
c
d
e
% after qrecord a.patch 'diff'
diff -r 5d1ca63427ee 1.txt
--- a/1.txt
+++ b/1.txt
@@ -1,5 +1,5 @@
1
2 2
3
-4
+4 4
5
diff -r 5d1ca63427ee dir/a.txt
--- a/dir/a.txt
+++ b/dir/a.txt
@@ -1,4 +1,4 @@
-hello world
+hello world!
someone
up
% qrecord b.patch
diff --git a/1.txt b/1.txt
1 hunks, 2 lines changed
timeless@mozdev.org
record: remove superfluous space
r9461 examine changes to '1.txt'? [Ynsfdaq?] @@ -1,5 +1,5 @@
Kirill Smelkov
qrecord: add tests
r5933 1
2 2
3
-4
+4 4
5
timeless@mozdev.org
record: remove superfluous space
r9461 record change 1/3 to '1.txt'? [Ynsfdaq?] diff --git a/dir/a.txt b/dir/a.txt
Kirill Smelkov
qrecord: add tests
r5933 1 hunks, 2 lines changed
timeless@mozdev.org
record: remove superfluous space
r9461 examine changes to 'dir/a.txt'? [Ynsfdaq?] @@ -1,4 +1,4 @@
Kirill Smelkov
qrecord: add tests
r5933 -hello world
+hello world!
someone
up
timeless@mozdev.org
record: remove superfluous space
r9461 record change 3/3 to 'dir/a.txt'? [Ynsfdaq?]
Kirill Smelkov
qrecord: add tests
r5933 % after qrecord b.patch 'tip'
changeset: 2:b056198bf878
tag: qtip
tag: tip
tag: b.patch
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: bbb
diff -r 5d1ca63427ee -r b056198bf878 1.txt
--- a/1.txt Thu Jan 01 00:00:00 1970 +0000
+++ b/1.txt Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +1,5 @@
1
2 2
3
-4
+4 4
5
diff -r 5d1ca63427ee -r b056198bf878 dir/a.txt
--- a/dir/a.txt Thu Jan 01 00:00:00 1970 +0000
+++ b/dir/a.txt Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +1,4 @@
-hello world
+hello world!
someone
up
% after qrecord b.patch 'diff'
% --- end ---