annotate tests/test-record.out @ 9434:f5ce9b052747

test-convert-git: Use ~ instead of ^

Solaris sh interprets ^ as pipe symbol and the test thus failed in strange
ways. git can however use of HEAD~ instead of HEAD^.

% help
hg record [OPTION]... [FILE]...

interactively select changes to commit

    If a list of files is omitted, all changes reported by "hg status"
    will be candidates for recording.

    See 'hg help dates' for a list of formats valid for -d/--date.

    You will be prompted for whether to record changes to each
    modified file, and for files with multiple changes, for each
    change to use. For each query, the following responses are
    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

options:

 -A --addremove     mark new/missing files as added/removed before committing
    --close-branch  mark a branch as closed, hiding it from the branch list
 -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
 -u --user          record the specified user as committer

use "hg -v help record" to show global options
% select no files
diff --git a/empty-rw b/empty-rw
new file mode 100644
examine changes to 'empty-rw'? [Ynsfdaq?]  no changes to record

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
examine changes to 'empty-rw'? [Ynsfdaq?]  abort: empty commit message

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
examine changes to 'empty-rw'? [Ynsfdaq?]  
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
examine changes to 'empty-rw' and 'empty-rename'? [Ynsfdaq?]  
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
examine changes to 'empty-rename' and 'empty-copy'? [Ynsfdaq?]  
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
examine changes to 'empty-copy'? [Ynsfdaq?]  
changeset:   3:a2546574bce9
tag:         tip
user:        test
date:        Thu Jan 01 00:00:03 1970 +0000
summary:     delete


% add binary file
1 changesets found
diff --git a/tip.bundle b/tip.bundle
new file mode 100644
this is a binary file
examine changes to 'tip.bundle'? [Ynsfdaq?]  
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
1 changesets found
diff --git a/tip.bundle b/tip.bundle
this modifies a binary file (all or nothing)
examine changes to 'tip.bundle'? [Ynsfdaq?]  
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
1 changesets found
diff --git a/tip.bundle b/top.bundle
rename from tip.bundle
rename to top.bundle
this modifies a binary file (all or nothing)
examine changes to 'tip.bundle' and 'top.bundle'? [Ynsfdaq?]  
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
examine changes to 'plain'? [Ynsfdaq?]  
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
examine changes to 'plain'? [Ynsfdaq?]  @@ -8,3 +8,4 @@
 8
 9
 10
+11
record this change to 'plain'? [Ynsfdaq?]  % modify end of plain file, no EOL
diff --git a/plain b/plain
1 hunks, 1 lines changed
examine changes to 'plain'? [Ynsfdaq?]  @@ -9,3 +9,4 @@
 9
 10
 11
+cf81a2760718a74d44c0c2eecb72f659e63a69c5
\ No newline at end of file
record this change to 'plain'? [Ynsfdaq?]  % modify end of plain file, add EOL
diff --git a/plain b/plain
1 hunks, 2 lines changed
examine changes to 'plain'? [Ynsfdaq?]  @@ -9,4 +9,4 @@
 9
 10
 11
-cf81a2760718a74d44c0c2eecb72f659e63a69c5
\ No newline at end of file
+cf81a2760718a74d44c0c2eecb72f659e63a69c5
record this change to 'plain'? [Ynsfdaq?]  % modify beginning, trim end, record both
diff --git a/plain b/plain
2 hunks, 4 lines changed
examine changes to 'plain'? [Ynsfdaq?]  @@ -1,4 +1,4 @@
-1
+2
 2
 3
 4
record change 1/2 to 'plain'? [Ynsfdaq?]  @@ -8,5 +8,3 @@
 8
 9
 10
-11
-cf81a2760718a74d44c0c2eecb72f659e63a69c5
record change 2/2 to 'plain'? [Ynsfdaq?]  
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
@@ -1,4 +1,4 @@
-1
+2
 2
 3
 4
@@ -8,5 +8,3 @@
 8
 9
 10
-11
-cf81a2760718a74d44c0c2eecb72f659e63a69c5

% trim beginning, modify end
% record end
diff --git a/plain b/plain
2 hunks, 5 lines changed
examine changes to 'plain'? [Ynsfdaq?]  @@ -1,9 +1,6 @@
-2
-2
-3
 4
 5
 6
 7
 8
 9
record change 1/2 to 'plain'? [Ynsfdaq?]  @@ -4,7 +1,7 @@
 4
 5
 6
 7
 8
 9
-10
+10.new
record change 2/2 to 'plain'? [Ynsfdaq?]  
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
@@ -7,4 +7,4 @@
 7
 8
 9
-10
+10.new

% record beginning
diff --git a/plain b/plain
1 hunks, 3 lines changed
examine changes to 'plain'? [Ynsfdaq?]  @@ -1,6 +1,3 @@
-2
-2
-3
 4
 5
 6
record this change to 'plain'? [Ynsfdaq?]  
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
@@ -1,6 +1,3 @@
-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
examine changes to 'plain'? [Ynsfdaq?]  @@ -1,6 +1,9 @@
+1
+2
+3
 4
 5
 6
 7
 8
 9
record change 1/2 to 'plain'? [Ynsfdaq?]  @@ -1,7 +4,6 @@
 4
 5
 6
 7
 8
 9
-10.new
record change 2/2 to 'plain'? [Ynsfdaq?]  % add to beginning, middle, end
% record beginning, middle
diff --git a/plain b/plain
3 hunks, 7 lines changed
examine changes to 'plain'? [Ynsfdaq?]  @@ -1,2 +1,5 @@
+1
+2
+3
 4
 5
record change 1/3 to 'plain'? [Ynsfdaq?]  @@ -1,6 +4,8 @@
 4
 5
+5.new
+5.reallynew
 6
 7
 8
 9
record change 2/3 to 'plain'? [Ynsfdaq?]  @@ -3,4 +8,6 @@
 6
 7
 8
 9
+10
+11
record change 3/3 to 'plain'? [Ynsfdaq?]  
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
@@ -1,5 +1,10 @@
+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
examine changes to 'plain'? [Ynsfdaq?]  @@ -9,3 +9,5 @@
 7
 8
 9
+10
+11
record this change to 'plain'? [Ynsfdaq?]  
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
@@ -9,3 +9,5 @@
 7
 8
 9
+10
+11

adding subdir/a
diff --git a/subdir/a b/subdir/a
1 hunks, 1 lines changed
examine changes to 'subdir/a'? [Ynsfdaq?]  @@ -1,1 +1,2 @@
 a
+a
record this change to 'subdir/a'? [Ynsfdaq?]  
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
@@ -1,1 +1,2 @@
 a
+a

% help, quit
diff --git a/subdir/f1 b/subdir/f1
1 hunks, 1 lines changed
examine changes to 'subdir/f1'? [Ynsfdaq?]  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
examine changes to 'subdir/f1'? [Ynsfdaq?]  abort: user quit
% skip
diff --git a/subdir/f1 b/subdir/f1
1 hunks, 1 lines changed
examine changes to 'subdir/f1'? [Ynsfdaq?]  diff --git a/subdir/f2 b/subdir/f2
1 hunks, 1 lines changed
examine changes to 'subdir/f2'? [Ynsfdaq?]  abort: response expected
% no
diff --git a/subdir/f1 b/subdir/f1
1 hunks, 1 lines changed
examine changes to 'subdir/f1'? [Ynsfdaq?]  diff --git a/subdir/f2 b/subdir/f2
1 hunks, 1 lines changed
examine changes to 'subdir/f2'? [Ynsfdaq?]  abort: response expected
% f, quit
diff --git a/subdir/f1 b/subdir/f1
1 hunks, 1 lines changed
examine changes to 'subdir/f1'? [Ynsfdaq?]  diff --git a/subdir/f2 b/subdir/f2
1 hunks, 1 lines changed
examine changes to 'subdir/f2'? [Ynsfdaq?]  abort: user quit
% s, all
diff --git a/subdir/f1 b/subdir/f1
1 hunks, 1 lines changed
examine changes to 'subdir/f1'? [Ynsfdaq?]  diff --git a/subdir/f2 b/subdir/f2
1 hunks, 1 lines changed
examine changes to 'subdir/f2'? [Ynsfdaq?]  
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
@@ -1,1 +1,2 @@
 b
+b

% f
diff --git a/subdir/f1 b/subdir/f1
1 hunks, 1 lines changed
examine changes to 'subdir/f1'? [Ynsfdaq?]  
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
@@ -1,1 +1,2 @@
 a
+a

% 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

% with win32ext
diff --git a/subdir/f1 b/subdir/f1
1 hunks, 1 lines changed
examine changes to 'subdir/f1'? [Ynsfdaq?]  @@ -3,3 +3,4 @@
 a
 b
 c
+d
record this change to 'subdir/f1'? [Ynsfdaq?]  
changeset:   25:49b3838dc9e7
tag:         tip
user:        test
date:        Thu Jan 01 00:00:23 1970 +0000
summary:     w1

diff -r 8fd83ff53ce6 -r 49b3838dc9e7 subdir/f1
--- a/subdir/f1	Thu Jan 01 00:00:22 1970 +0000
+++ b/subdir/f1	Thu Jan 01 00:00:23 1970 +0000
@@ -3,3 +3,4 @@
 a
 b
 c
+d