test-record.out
576 lines
| 12.4 KiB
| text/plain
|
TextLexer
/ tests / test-record.out
|
r5037 | % help | ||
|
r5040 | hg record [OPTION]... [FILE]... | ||
|
r5037 | |||
interactively select changes to commit | ||||
|
r5154 | If a list of files is omitted, all changes reported by "hg status" | ||
will be candidates for recording. | ||||
|
r6163 | See 'hg help dates' for a list of formats valid for -d/--date. | ||
|
r5154 | You will be prompted for whether to record changes to each | ||
modified file, and for files with multiple changes, for each | ||||
|
r7983 | change to use. For each query, the following responses are | ||
|
r5154 | possible: | ||
y - record this change | ||||
n - skip this change | ||||
s - skip remaining changes to this file | ||||
f - record remaining changes to this file | ||||
d - done, skip remaining changes and files | ||||
a - record all changes to all remaining files | ||||
q - quit, recording no changes | ||||
? - display help | ||||
|
r5037 | options: | ||
|
r8039 | -A --addremove mark new/missing files as added/removed before | ||
committing | ||||
--close-branch mark a branch as closed, hiding it from the branch | ||||
list | ||||
|
r7657 | -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> | ||||
-d --date record datecode as commit date | ||||
|
r8313 | -u --user record the specified user as committer | ||
|
r5037 | |||
use "hg -v help record" to show global options | ||||
% select no files | ||||
diff --git a/empty-rw b/empty-rw | ||||
new file mode 100644 | ||||
|
r5286 | examine changes to 'empty-rw'? [Ynsfdaq?] no changes to record | ||
|
r5037 | |||
changeset: -1:000000000000 | ||||
tag: tip | ||||
user: | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
% select files but no hunks | ||||
diff --git a/empty-rw b/empty-rw | ||||
new file mode 100644 | ||||
|
r5286 | examine changes to 'empty-rw'? [Ynsfdaq?] transaction abort! | ||
|
r5037 | rollback completed | ||
|
r5757 | abort: empty commit message | ||
|
r5037 | |||
changeset: -1:000000000000 | ||||
tag: tip | ||||
user: | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
% record empty file | ||||
diff --git a/empty-rw b/empty-rw | ||||
new file mode 100644 | ||||
|
r5286 | examine changes to 'empty-rw'? [Ynsfdaq?] | ||
|
r5037 | changeset: 0:c0708cf4e46e | ||
tag: tip | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: empty | ||||
% rename empty file | ||||
diff --git a/empty-rw b/empty-rename | ||||
rename from empty-rw | ||||
rename to empty-rename | ||||
|
r5286 | examine changes to 'empty-rw' and 'empty-rename'? [Ynsfdaq?] | ||
|
r5037 | changeset: 1:df251d174da3 | ||
tag: tip | ||||
user: test | ||||
date: Thu Jan 01 00:00:01 1970 +0000 | ||||
summary: rename | ||||
% copy empty file | ||||
diff --git a/empty-rename b/empty-copy | ||||
copy from empty-rename | ||||
copy to empty-copy | ||||
|
r5286 | examine changes to 'empty-rename' and 'empty-copy'? [Ynsfdaq?] | ||
|
r5037 | changeset: 2:b63ea3939f8d | ||
tag: tip | ||||
user: test | ||||
date: Thu Jan 01 00:00:02 1970 +0000 | ||||
summary: copy | ||||
% delete empty file | ||||
diff --git a/empty-copy b/empty-copy | ||||
deleted file mode 100644 | ||||
|
r5286 | examine changes to 'empty-copy'? [Ynsfdaq?] | ||
|
r5037 | changeset: 3:a2546574bce9 | ||
tag: tip | ||||
user: test | ||||
date: Thu Jan 01 00:00:03 1970 +0000 | ||||
summary: delete | ||||
% add binary file | ||||
|
r5763 | 1 changesets found | ||
|
r5037 | diff --git a/tip.bundle b/tip.bundle | ||
new file mode 100644 | ||||
this is a binary file | ||||
|
r5286 | examine changes to 'tip.bundle'? [Ynsfdaq?] | ||
|
r5037 | changeset: 4:9e998a545a8b | ||
tag: tip | ||||
user: test | ||||
date: Thu Jan 01 00:00:04 1970 +0000 | ||||
summary: binary | ||||
diff -r a2546574bce9 -r 9e998a545a8b tip.bundle | ||||
Binary file tip.bundle has changed | ||||
% change binary file | ||||
|
r5763 | 1 changesets found | ||
|
r5037 | diff --git a/tip.bundle b/tip.bundle | ||
this modifies a binary file (all or nothing) | ||||
|
r5286 | examine changes to 'tip.bundle'? [Ynsfdaq?] | ||
|
r5037 | changeset: 5:93d05561507d | ||
tag: tip | ||||
user: test | ||||
date: Thu Jan 01 00:00:05 1970 +0000 | ||||
summary: binary-change | ||||
diff -r 9e998a545a8b -r 93d05561507d tip.bundle | ||||
Binary file tip.bundle has changed | ||||
% rename and change binary file | ||||
|
r5763 | 1 changesets found | ||
|
r5037 | diff --git a/tip.bundle b/top.bundle | ||
rename from tip.bundle | ||||
rename to top.bundle | ||||
this modifies a binary file (all or nothing) | ||||
|
r5286 | examine changes to 'tip.bundle' and 'top.bundle'? [Ynsfdaq?] | ||
|
r5037 | changeset: 6:699cc1bea9aa | ||
tag: tip | ||||
user: test | ||||
date: Thu Jan 01 00:00:06 1970 +0000 | ||||
summary: binary-change-rename | ||||
diff -r 93d05561507d -r 699cc1bea9aa tip.bundle | ||||
Binary file tip.bundle has changed | ||||
diff -r 93d05561507d -r 699cc1bea9aa top.bundle | ||||
Binary file top.bundle has changed | ||||
% add plain file | ||||
diff --git a/plain b/plain | ||||
new file mode 100644 | ||||
|
r5286 | examine changes to 'plain'? [Ynsfdaq?] | ||
|
r5037 | changeset: 7:118ed744216b | ||
tag: tip | ||||
user: test | ||||
date: Thu Jan 01 00:00:07 1970 +0000 | ||||
summary: plain | ||||
diff -r 699cc1bea9aa -r 118ed744216b plain | ||||
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 | ||||
+++ b/plain Thu Jan 01 00:00:07 1970 +0000 | ||||
@@ -0,0 +1,10 @@ | ||||
+1 | ||||
+2 | ||||
+3 | ||||
+4 | ||||
+5 | ||||
+6 | ||||
+7 | ||||
+8 | ||||
+9 | ||||
+10 | ||||
% modify end of plain file | ||||
diff --git a/plain b/plain | ||||
1 hunks, 1 lines changed | ||||
|
r5863 | examine changes to 'plain'? [Ynsfdaq?] @@ -8,3 +8,4 @@ | ||
|
r5037 | 8 | ||
9 | ||||
10 | ||||
+11 | ||||
|
r5154 | record this change to 'plain'? [Ynsfdaq?] % modify end of plain file, no EOL | ||
|
r5037 | diff --git a/plain b/plain | ||
1 hunks, 1 lines changed | ||||
|
r5863 | examine changes to 'plain'? [Ynsfdaq?] @@ -9,3 +9,4 @@ | ||
|
r5037 | 9 | ||
10 | ||||
11 | ||||
+cf81a2760718a74d44c0c2eecb72f659e63a69c5 | ||||
\ No newline at end of file | ||||
|
r5154 | record this change to 'plain'? [Ynsfdaq?] % modify end of plain file, add EOL | ||
|
r5037 | diff --git a/plain b/plain | ||
1 hunks, 2 lines changed | ||||
|
r5863 | examine changes to 'plain'? [Ynsfdaq?] @@ -9,4 +9,4 @@ | ||
|
r5037 | 9 | ||
10 | ||||
11 | ||||
-cf81a2760718a74d44c0c2eecb72f659e63a69c5 | ||||
\ No newline at end of file | ||||
+cf81a2760718a74d44c0c2eecb72f659e63a69c5 | ||||
|
r5154 | record this change to 'plain'? [Ynsfdaq?] % modify beginning, trim end, record both | ||
|
r5037 | diff --git a/plain b/plain | ||
2 hunks, 4 lines changed | ||||
|
r5863 | examine changes to 'plain'? [Ynsfdaq?] @@ -1,4 +1,4 @@ | ||
|
r5037 | -1 | ||
+2 | ||||
2 | ||||
3 | ||||
4 | ||||
|
r7910 | record change 1/2 to 'plain'? [Ynsfdaq?] @@ -8,5 +8,3 @@ | ||
|
r5037 | 8 | ||
9 | ||||
10 | ||||
-11 | ||||
-cf81a2760718a74d44c0c2eecb72f659e63a69c5 | ||||
|
r7910 | record change 2/2 to 'plain'? [Ynsfdaq?] | ||
|
r5037 | changeset: 11:d09ab1967dab | ||
tag: tip | ||||
user: test | ||||
date: Thu Jan 01 00:00:10 1970 +0000 | ||||
summary: begin-and-end | ||||
diff -r e2ecd9b0b78d -r d09ab1967dab plain | ||||
--- a/plain Thu Jan 01 00:00:10 1970 +0000 | ||||
+++ b/plain Thu Jan 01 00:00:10 1970 +0000 | ||||
|
r5863 | @@ -1,4 +1,4 @@ | ||
|
r5037 | -1 | ||
+2 | ||||
2 | ||||
3 | ||||
4 | ||||
|
r5863 | @@ -8,5 +8,3 @@ | ||
|
r5037 | 8 | ||
9 | ||||
10 | ||||
-11 | ||||
-cf81a2760718a74d44c0c2eecb72f659e63a69c5 | ||||
% trim beginning, modify end | ||||
% record end | ||||
diff --git a/plain b/plain | ||||
2 hunks, 5 lines changed | ||||
|
r5863 | examine changes to 'plain'? [Ynsfdaq?] @@ -1,9 +1,6 @@ | ||
|
r5037 | -2 | ||
-2 | ||||
-3 | ||||
4 | ||||
5 | ||||
6 | ||||
7 | ||||
8 | ||||
9 | ||||
|
r7910 | record change 1/2 to 'plain'? [Ynsfdaq?] @@ -4,7 +1,7 @@ | ||
|
r5037 | 4 | ||
5 | ||||
6 | ||||
7 | ||||
8 | ||||
9 | ||||
-10 | ||||
+10.new | ||||
|
r7910 | record change 2/2 to 'plain'? [Ynsfdaq?] | ||
|
r5037 | changeset: 12:44516c9708ae | ||
tag: tip | ||||
user: test | ||||
date: Thu Jan 01 00:00:11 1970 +0000 | ||||
summary: end-only | ||||
diff -r d09ab1967dab -r 44516c9708ae plain | ||||
--- a/plain Thu Jan 01 00:00:10 1970 +0000 | ||||
+++ b/plain Thu Jan 01 00:00:11 1970 +0000 | ||||
|
r5863 | @@ -7,4 +7,4 @@ | ||
|
r5037 | 7 | ||
8 | ||||
9 | ||||
-10 | ||||
+10.new | ||||
% record beginning | ||||
diff --git a/plain b/plain | ||||
1 hunks, 3 lines changed | ||||
|
r5863 | examine changes to 'plain'? [Ynsfdaq?] @@ -1,6 +1,3 @@ | ||
|
r5037 | -2 | ||
-2 | ||||
-3 | ||||
4 | ||||
5 | ||||
6 | ||||
|
r5154 | record this change to 'plain'? [Ynsfdaq?] | ||
|
r5037 | changeset: 13:3ebbace64a8d | ||
tag: tip | ||||
user: test | ||||
date: Thu Jan 01 00:00:12 1970 +0000 | ||||
summary: begin-only | ||||
diff -r 44516c9708ae -r 3ebbace64a8d plain | ||||
--- a/plain Thu Jan 01 00:00:11 1970 +0000 | ||||
+++ b/plain Thu Jan 01 00:00:12 1970 +0000 | ||||
|
r5863 | @@ -1,6 +1,3 @@ | ||
|
r5037 | -2 | ||
-2 | ||||
-3 | ||||
4 | ||||
5 | ||||
6 | ||||
% add to beginning, trim from end | ||||
% record end | ||||
diff --git a/plain b/plain | ||||
2 hunks, 4 lines changed | ||||
|
r5863 | examine changes to 'plain'? [Ynsfdaq?] @@ -1,6 +1,9 @@ | ||
|
r5037 | +1 | ||
+2 | ||||
+3 | ||||
4 | ||||
5 | ||||
6 | ||||
7 | ||||
8 | ||||
9 | ||||
|
r7910 | record change 1/2 to 'plain'? [Ynsfdaq?] @@ -1,7 +4,6 @@ | ||
|
r5037 | 4 | ||
5 | ||||
6 | ||||
7 | ||||
8 | ||||
9 | ||||
-10.new | ||||
|
r7910 | record change 2/2 to 'plain'? [Ynsfdaq?] % add to beginning, middle, end | ||
|
r5037 | % record beginning, middle | ||
diff --git a/plain b/plain | ||||
3 hunks, 7 lines changed | ||||
|
r5863 | examine changes to 'plain'? [Ynsfdaq?] @@ -1,2 +1,5 @@ | ||
|
r5037 | +1 | ||
+2 | ||||
+3 | ||||
4 | ||||
5 | ||||
|
r7910 | record change 1/3 to 'plain'? [Ynsfdaq?] @@ -1,6 +4,8 @@ | ||
|
r5037 | 4 | ||
5 | ||||
+5.new | ||||
+5.reallynew | ||||
6 | ||||
7 | ||||
8 | ||||
9 | ||||
|
r7910 | record change 2/3 to 'plain'? [Ynsfdaq?] @@ -3,4 +8,6 @@ | ||
|
r5037 | 6 | ||
7 | ||||
8 | ||||
9 | ||||
+10 | ||||
+11 | ||||
|
r7910 | record change 3/3 to 'plain'? [Ynsfdaq?] | ||
|
r5037 | changeset: 15:c1c639d8b268 | ||
tag: tip | ||||
user: test | ||||
date: Thu Jan 01 00:00:14 1970 +0000 | ||||
summary: middle-only | ||||
diff -r efc0dad7bd9f -r c1c639d8b268 plain | ||||
--- a/plain Thu Jan 01 00:00:13 1970 +0000 | ||||
+++ b/plain Thu Jan 01 00:00:14 1970 +0000 | ||||
|
r5863 | @@ -1,5 +1,10 @@ | ||
|
r5037 | +1 | ||
+2 | ||||
+3 | ||||
4 | ||||
5 | ||||
+5.new | ||||
+5.reallynew | ||||
6 | ||||
7 | ||||
8 | ||||
% record end | ||||
diff --git a/plain b/plain | ||||
1 hunks, 2 lines changed | ||||
|
r5863 | examine changes to 'plain'? [Ynsfdaq?] @@ -9,3 +9,5 @@ | ||
|
r5037 | 7 | ||
8 | ||||
9 | ||||
+10 | ||||
+11 | ||||
|
r5154 | record this change to 'plain'? [Ynsfdaq?] | ||
|
r5037 | changeset: 16:80b74bbc7808 | ||
tag: tip | ||||
user: test | ||||
date: Thu Jan 01 00:00:15 1970 +0000 | ||||
summary: end-only | ||||
diff -r c1c639d8b268 -r 80b74bbc7808 plain | ||||
--- a/plain Thu Jan 01 00:00:14 1970 +0000 | ||||
+++ b/plain Thu Jan 01 00:00:15 1970 +0000 | ||||
|
r5863 | @@ -9,3 +9,5 @@ | ||
|
r5037 | 7 | ||
8 | ||||
9 | ||||
+10 | ||||
+11 | ||||
|
r5128 | adding subdir/a | ||
diff --git a/subdir/a b/subdir/a | ||||
1 hunks, 1 lines changed | ||||
|
r5863 | examine changes to 'subdir/a'? [Ynsfdaq?] @@ -1,1 +1,2 @@ | ||
|
r5128 | a | ||
+a | ||||
|
r5154 | record this change to 'subdir/a'? [Ynsfdaq?] | ||
|
r5128 | changeset: 18:33ff5c4fb017 | ||
tag: tip | ||||
user: test | ||||
date: Thu Jan 01 00:00:16 1970 +0000 | ||||
summary: subdir-change | ||||
diff -r aecf2b2ea83c -r 33ff5c4fb017 subdir/a | ||||
--- a/subdir/a Thu Jan 01 00:00:16 1970 +0000 | ||||
+++ b/subdir/a Thu Jan 01 00:00:16 1970 +0000 | ||||
|
r5863 | @@ -1,1 +1,2 @@ | ||
|
r5128 | a | ||
+a | ||||
|
r5154 | % help, quit | ||
diff --git a/subdir/f1 b/subdir/f1 | ||||
1 hunks, 1 lines changed | ||||
|
r5286 | examine changes to 'subdir/f1'? [Ynsfdaq?] y - record this change | ||
|
r5154 | n - skip this change | ||
s - skip remaining changes to this file | ||||
f - record remaining changes to this file | ||||
d - done, skip remaining changes and files | ||||
a - record all changes to all remaining files | ||||
q - quit, recording no changes | ||||
? - display help | ||||
|
r5286 | examine changes to 'subdir/f1'? [Ynsfdaq?] abort: user quit | ||
|
r5154 | % skip | ||
diff --git a/subdir/f1 b/subdir/f1 | ||||
1 hunks, 1 lines changed | ||||
|
r5286 | examine changes to 'subdir/f1'? [Ynsfdaq?] diff --git a/subdir/f2 b/subdir/f2 | ||
|
r5154 | 1 hunks, 1 lines changed | ||
|
r5286 | examine changes to 'subdir/f2'? [Ynsfdaq?] abort: response expected | ||
|
r5154 | % no | ||
diff --git a/subdir/f1 b/subdir/f1 | ||||
1 hunks, 1 lines changed | ||||
|
r5286 | examine changes to 'subdir/f1'? [Ynsfdaq?] diff --git a/subdir/f2 b/subdir/f2 | ||
|
r5154 | 1 hunks, 1 lines changed | ||
|
r5286 | examine changes to 'subdir/f2'? [Ynsfdaq?] abort: response expected | ||
|
r5154 | % f, quit | ||
diff --git a/subdir/f1 b/subdir/f1 | ||||
1 hunks, 1 lines changed | ||||
|
r5286 | examine changes to 'subdir/f1'? [Ynsfdaq?] diff --git a/subdir/f2 b/subdir/f2 | ||
|
r5154 | 1 hunks, 1 lines changed | ||
|
r5286 | examine changes to 'subdir/f2'? [Ynsfdaq?] abort: user quit | ||
|
r5154 | % s, all | ||
diff --git a/subdir/f1 b/subdir/f1 | ||||
1 hunks, 1 lines changed | ||||
|
r5286 | examine changes to 'subdir/f1'? [Ynsfdaq?] diff --git a/subdir/f2 b/subdir/f2 | ||
|
r5154 | 1 hunks, 1 lines changed | ||
|
r5286 | examine changes to 'subdir/f2'? [Ynsfdaq?] | ||
|
r5154 | changeset: 20:094183e04b7c | ||
tag: tip | ||||
user: test | ||||
date: Thu Jan 01 00:00:18 1970 +0000 | ||||
summary: x | ||||
diff -r f9e855cd9374 -r 094183e04b7c subdir/f2 | ||||
--- a/subdir/f2 Thu Jan 01 00:00:17 1970 +0000 | ||||
+++ b/subdir/f2 Thu Jan 01 00:00:18 1970 +0000 | ||||
|
r5863 | @@ -1,1 +1,2 @@ | ||
|
r5154 | b | ||
+b | ||||
% f | ||||
diff --git a/subdir/f1 b/subdir/f1 | ||||
1 hunks, 1 lines changed | ||||
|
r5286 | examine changes to 'subdir/f1'? [Ynsfdaq?] | ||
|
r5154 | changeset: 21:38164785b0ef | ||
tag: tip | ||||
user: test | ||||
date: Thu Jan 01 00:00:19 1970 +0000 | ||||
summary: y | ||||
diff -r 094183e04b7c -r 38164785b0ef subdir/f1 | ||||
--- a/subdir/f1 Thu Jan 01 00:00:18 1970 +0000 | ||||
+++ b/subdir/f1 Thu Jan 01 00:00:19 1970 +0000 | ||||
|
r5863 | @@ -1,1 +1,2 @@ | ||
|
r5154 | a | ||
+a | ||||
|
r7718 | % preserve chmod +x | ||
diff --git a/subdir/f1 b/subdir/f1 | ||||
old mode 100644 | ||||
new mode 100755 | ||||
1 hunks, 1 lines changed | ||||
examine changes to 'subdir/f1'? [Ynsfdaq?] @@ -1,2 +1,3 @@ | ||||
a | ||||
a | ||||
+a | ||||
record this change to 'subdir/f1'? [Ynsfdaq?] | ||||
changeset: 22:a891589cb933 | ||||
tag: tip | ||||
user: test | ||||
date: Thu Jan 01 00:00:20 1970 +0000 | ||||
summary: z | ||||
diff --git a/subdir/f1 b/subdir/f1 | ||||
old mode 100644 | ||||
new mode 100755 | ||||
--- a/subdir/f1 | ||||
+++ b/subdir/f1 | ||||
@@ -1,2 +1,3 @@ | ||||
a | ||||
a | ||||
+a | ||||
% preserve execute permission on original | ||||
diff --git a/subdir/f1 b/subdir/f1 | ||||
1 hunks, 1 lines changed | ||||
examine changes to 'subdir/f1'? [Ynsfdaq?] @@ -1,3 +1,4 @@ | ||||
a | ||||
a | ||||
a | ||||
+b | ||||
record this change to 'subdir/f1'? [Ynsfdaq?] | ||||
changeset: 23:befa0dae6201 | ||||
tag: tip | ||||
user: test | ||||
date: Thu Jan 01 00:00:21 1970 +0000 | ||||
summary: aa | ||||
diff --git a/subdir/f1 b/subdir/f1 | ||||
--- a/subdir/f1 | ||||
+++ b/subdir/f1 | ||||
@@ -1,3 +1,4 @@ | ||||
a | ||||
a | ||||
a | ||||
+b | ||||
% preserve chmod -x | ||||
diff --git a/subdir/f1 b/subdir/f1 | ||||
old mode 100755 | ||||
new mode 100644 | ||||
1 hunks, 1 lines changed | ||||
examine changes to 'subdir/f1'? [Ynsfdaq?] @@ -2,3 +2,4 @@ | ||||
a | ||||
a | ||||
b | ||||
+c | ||||
record this change to 'subdir/f1'? [Ynsfdaq?] | ||||
changeset: 24:8fd83ff53ce6 | ||||
tag: tip | ||||
user: test | ||||
date: Thu Jan 01 00:00:22 1970 +0000 | ||||
summary: ab | ||||
diff --git a/subdir/f1 b/subdir/f1 | ||||
old mode 100755 | ||||
new mode 100644 | ||||
--- a/subdir/f1 | ||||
+++ b/subdir/f1 | ||||
@@ -2,3 +2,4 @@ | ||||
a | ||||
a | ||||
b | ||||
+c | ||||