##// END OF EJS Templates
filelog: sort meta entries, ensure deterministic order
filelog: sort meta entries, ensure deterministic order

File last commit:

r10490:f2618cac stable
r10490:f2618cac stable
Show More
test-record.out
595 lines | 12.8 KiB | text/plain | TextLexer
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
r5037 % help
Thomas Arendsen Hein
Update style of record's cmdtable to match mercurial/commands.py
r5040 hg record [OPTION]... [FILE]...
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
r5037
interactively select changes to commit
Martin Geisler
record: wrapped docstrings at 78 characters
r9074 If a list of files is omitted, all changes reported by "hg status" will be
candidates for recording.
Bryan O'Sullivan
record: improve docs, improve prompts
r5154
Thomas Arendsen Hein
Document log date ranges and mention 'hg help dates' for all commands (issue998)
r6163 See 'hg help dates' for a list of formats valid for -d/--date.
Martin Geisler
record: wrapped docstrings at 78 characters
r9074 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:
Bryan O'Sullivan
record: improve docs, improve prompts
r5154
Martin Geisler
minirst: indent literal blocks with two spaces...
r9291 y - record this change
n - skip this change
Bryan O'Sullivan
record: improve docs, improve prompts
r5154
Martin Geisler
minirst: indent literal blocks with two spaces...
r9291 s - skip remaining changes to this file
f - record remaining changes to this file
Bryan O'Sullivan
record: improve docs, improve prompts
r5154
Martin Geisler
minirst: indent literal blocks with two spaces...
r9291 d - done, skip remaining changes and files
a - record all changes to all remaining files
q - quit, recording no changes
Bryan O'Sullivan
record: improve docs, improve prompts
r5154
Martin Geisler
minirst: indent literal blocks with two spaces...
r9291 ? - display help
Bryan O'Sullivan
record: improve docs, improve prompts
r5154
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
r5037 options:
Martin Geisler
commands: wrap short descriptions in 'hg help'...
r8938 -A --addremove mark new/missing files as added/removed before committing
--close-branch mark a branch as closed, hiding it from the branch list
John Mulligan
branch closing: add test for branch closing (and reopening)
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
Sverre Rabbelier
commit: be more verbose in the -u help text...
r8313 -u --user record the specified user as committer
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
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
timeless@mozdev.org
record: remove superfluous space
r9461 examine changes to 'empty-rw'? [Ynsfdaq?] no changes to record
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
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
timeless@mozdev.org
record: remove superfluous space
r9461 examine changes to 'empty-rw'? [Ynsfdaq?] abort: empty commit message
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
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
timeless@mozdev.org
record: remove superfluous space
r9461 examine changes to 'empty-rw'? [Ynsfdaq?]
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
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
timeless@mozdev.org
record: remove superfluous space
r9461 examine changes to 'empty-rw' and 'empty-rename'? [Ynsfdaq?]
Ronny Pfannschmidt
filelog: sort meta entries, ensure deterministic order
r10490 changeset: 1:d695e8dcb197
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
r5037 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
timeless@mozdev.org
record: remove superfluous space
r9461 examine changes to 'empty-rename' and 'empty-copy'? [Ynsfdaq?]
Ronny Pfannschmidt
filelog: sort meta entries, ensure deterministic order
r10490 changeset: 2:1d4b90bea524
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
r5037 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
timeless@mozdev.org
record: remove superfluous space
r9461 examine changes to 'empty-copy'? [Ynsfdaq?]
Ronny Pfannschmidt
filelog: sort meta entries, ensure deterministic order
r10490 changeset: 3:b39a238f01a1
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
r5037 tag: tip
user: test
date: Thu Jan 01 00:00:03 1970 +0000
summary: delete
% add binary file
Thomas Arendsen Hein
Show number of changesets written to bundle files by default (issue569)...
r5763 1 changesets found
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
r5037 diff --git a/tip.bundle b/tip.bundle
new file mode 100644
this is a binary file
timeless@mozdev.org
record: remove superfluous space
r9461 examine changes to 'tip.bundle'? [Ynsfdaq?]
Ronny Pfannschmidt
filelog: sort meta entries, ensure deterministic order
r10490 changeset: 4:ad816da3711e
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
r5037 tag: tip
user: test
date: Thu Jan 01 00:00:04 1970 +0000
summary: binary
Ronny Pfannschmidt
filelog: sort meta entries, ensure deterministic order
r10490 diff -r b39a238f01a1 -r ad816da3711e tip.bundle
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
r5037 Binary file tip.bundle has changed
% change binary file
Thomas Arendsen Hein
Show number of changesets written to bundle files by default (issue569)...
r5763 1 changesets found
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
r5037 diff --git a/tip.bundle b/tip.bundle
this modifies a binary file (all or nothing)
timeless@mozdev.org
record: remove superfluous space
r9461 examine changes to 'tip.bundle'? [Ynsfdaq?]
Ronny Pfannschmidt
filelog: sort meta entries, ensure deterministic order
r10490 changeset: 5:dccd6f3eb485
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
r5037 tag: tip
user: test
date: Thu Jan 01 00:00:05 1970 +0000
summary: binary-change
Ronny Pfannschmidt
filelog: sort meta entries, ensure deterministic order
r10490 diff -r ad816da3711e -r dccd6f3eb485 tip.bundle
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
r5037 Binary file tip.bundle has changed
% rename and change binary file
Thomas Arendsen Hein
Show number of changesets written to bundle files by default (issue569)...
r5763 1 changesets found
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
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)
timeless@mozdev.org
record: remove superfluous space
r9461 examine changes to 'tip.bundle' and 'top.bundle'? [Ynsfdaq?]
Ronny Pfannschmidt
filelog: sort meta entries, ensure deterministic order
r10490 changeset: 6:7fa44105f5b3
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
r5037 tag: tip
user: test
date: Thu Jan 01 00:00:06 1970 +0000
summary: binary-change-rename
Ronny Pfannschmidt
filelog: sort meta entries, ensure deterministic order
r10490 diff -r dccd6f3eb485 -r 7fa44105f5b3 tip.bundle
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
r5037 Binary file tip.bundle has changed
Ronny Pfannschmidt
filelog: sort meta entries, ensure deterministic order
r10490 diff -r dccd6f3eb485 -r 7fa44105f5b3 top.bundle
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
r5037 Binary file top.bundle has changed
% add plain file
diff --git a/plain b/plain
new file mode 100644
timeless@mozdev.org
record: remove superfluous space
r9461 examine changes to 'plain'? [Ynsfdaq?]
Ronny Pfannschmidt
filelog: sort meta entries, ensure deterministic order
r10490 changeset: 7:11fb457c1be4
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
r5037 tag: tip
user: test
date: Thu Jan 01 00:00:07 1970 +0000
summary: plain
Ronny Pfannschmidt
filelog: sort meta entries, ensure deterministic order
r10490 diff -r 7fa44105f5b3 -r 11fb457c1be4 plain
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
r5037 --- /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
timeless@mozdev.org
record: remove superfluous space
r9461 examine changes to 'plain'? [Ynsfdaq?] @@ -8,3 +8,4 @@
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
r5037 8
9
10
+11
timeless@mozdev.org
record: remove superfluous space
r9461 record this change to 'plain'? [Ynsfdaq?] % modify end of plain file, no EOL
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
r5037 diff --git a/plain b/plain
1 hunks, 1 lines changed
timeless@mozdev.org
record: remove superfluous space
r9461 examine changes to 'plain'? [Ynsfdaq?] @@ -9,3 +9,4 @@
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
r5037 9
10
11
Ronny Pfannschmidt
filelog: sort meta entries, ensure deterministic order
r10490 +7264f99c5f5ff3261504828afa4fb4d406c3af54
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
r5037 \ No newline at end of file
timeless@mozdev.org
record: remove superfluous space
r9461 record this change to 'plain'? [Ynsfdaq?] % modify end of plain file, add EOL
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
r5037 diff --git a/plain b/plain
1 hunks, 2 lines changed
timeless@mozdev.org
record: remove superfluous space
r9461 examine changes to 'plain'? [Ynsfdaq?] @@ -9,4 +9,4 @@
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
r5037 9
10
11
Ronny Pfannschmidt
filelog: sort meta entries, ensure deterministic order
r10490 -7264f99c5f5ff3261504828afa4fb4d406c3af54
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
r5037 \ No newline at end of file
Ronny Pfannschmidt
filelog: sort meta entries, ensure deterministic order
r10490 +7264f99c5f5ff3261504828afa4fb4d406c3af54
timeless@mozdev.org
record: remove superfluous space
r9461 record this change to 'plain'? [Ynsfdaq?] % modify beginning, trim end, record both
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
r5037 diff --git a/plain b/plain
2 hunks, 4 lines changed
timeless@mozdev.org
record: remove superfluous space
r9461 examine changes to 'plain'? [Ynsfdaq?] @@ -1,4 +1,4 @@
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
r5037 -1
+2
2
3
4
timeless@mozdev.org
record: remove superfluous space
r9461 record change 1/2 to 'plain'? [Ynsfdaq?] @@ -8,5 +8,3 @@
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
r5037 8
9
10
-11
Ronny Pfannschmidt
filelog: sort meta entries, ensure deterministic order
r10490 -7264f99c5f5ff3261504828afa4fb4d406c3af54
timeless@mozdev.org
record: remove superfluous space
r9461 record change 2/2 to 'plain'? [Ynsfdaq?]
Ronny Pfannschmidt
filelog: sort meta entries, ensure deterministic order
r10490 changeset: 11:efca65c9b09e
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
r5037 tag: tip
user: test
date: Thu Jan 01 00:00:10 1970 +0000
summary: begin-and-end
Ronny Pfannschmidt
filelog: sort meta entries, ensure deterministic order
r10490 diff -r cd07d48e8cbe -r efca65c9b09e plain
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
r5037 --- a/plain Thu Jan 01 00:00:10 1970 +0000
+++ b/plain Thu Jan 01 00:00:10 1970 +0000
Matt Mackall
diff: don't show function name by default...
r5863 @@ -1,4 +1,4 @@
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
r5037 -1
+2
2
3
4
Matt Mackall
diff: don't show function name by default...
r5863 @@ -8,5 +8,3 @@
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
r5037 8
9
10
-11
Ronny Pfannschmidt
filelog: sort meta entries, ensure deterministic order
r10490 -7264f99c5f5ff3261504828afa4fb4d406c3af54
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
r5037
% trim beginning, modify end
% record end
diff --git a/plain b/plain
2 hunks, 5 lines changed
timeless@mozdev.org
record: remove superfluous space
r9461 examine changes to 'plain'? [Ynsfdaq?] @@ -1,9 +1,6 @@
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
r5037 -2
-2
-3
4
5
6
7
8
9
timeless@mozdev.org
record: remove superfluous space
r9461 record change 1/2 to 'plain'? [Ynsfdaq?] @@ -4,7 +1,7 @@
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
r5037 4
5
6
7
8
9
-10
+10.new
timeless@mozdev.org
record: remove superfluous space
r9461 record change 2/2 to 'plain'? [Ynsfdaq?]
Ronny Pfannschmidt
filelog: sort meta entries, ensure deterministic order
r10490 changeset: 12:7d1e66983c15
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
r5037 tag: tip
user: test
date: Thu Jan 01 00:00:11 1970 +0000
summary: end-only
Ronny Pfannschmidt
filelog: sort meta entries, ensure deterministic order
r10490 diff -r efca65c9b09e -r 7d1e66983c15 plain
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
r5037 --- a/plain Thu Jan 01 00:00:10 1970 +0000
+++ b/plain Thu Jan 01 00:00:11 1970 +0000
Matt Mackall
diff: don't show function name by default...
r5863 @@ -7,4 +7,4 @@
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
r5037 7
8
9
-10
+10.new
% record beginning
diff --git a/plain b/plain
1 hunks, 3 lines changed
timeless@mozdev.org
record: remove superfluous space
r9461 examine changes to 'plain'? [Ynsfdaq?] @@ -1,6 +1,3 @@
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
r5037 -2
-2
-3
4
5
6
timeless@mozdev.org
record: remove superfluous space
r9461 record this change to 'plain'? [Ynsfdaq?]
Ronny Pfannschmidt
filelog: sort meta entries, ensure deterministic order
r10490 changeset: 13:a09fc62a0e61
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
r5037 tag: tip
user: test
date: Thu Jan 01 00:00:12 1970 +0000
summary: begin-only
Ronny Pfannschmidt
filelog: sort meta entries, ensure deterministic order
r10490 diff -r 7d1e66983c15 -r a09fc62a0e61 plain
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
r5037 --- a/plain Thu Jan 01 00:00:11 1970 +0000
+++ b/plain Thu Jan 01 00:00:12 1970 +0000
Matt Mackall
diff: don't show function name by default...
r5863 @@ -1,6 +1,3 @@
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
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
timeless@mozdev.org
record: remove superfluous space
r9461 examine changes to 'plain'? [Ynsfdaq?] @@ -1,6 +1,9 @@
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
r5037 +1
+2
+3
4
5
6
7
8
9
timeless@mozdev.org
record: remove superfluous space
r9461 record change 1/2 to 'plain'? [Ynsfdaq?] @@ -1,7 +4,6 @@
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
r5037 4
5
6
7
8
9
-10.new
timeless@mozdev.org
record: remove superfluous space
r9461 record change 2/2 to 'plain'? [Ynsfdaq?] % add to beginning, middle, end
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
r5037 % record beginning, middle
diff --git a/plain b/plain
3 hunks, 7 lines changed
timeless@mozdev.org
record: remove superfluous space
r9461 examine changes to 'plain'? [Ynsfdaq?] @@ -1,2 +1,5 @@
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
r5037 +1
+2
+3
4
5
timeless@mozdev.org
record: remove superfluous space
r9461 record change 1/3 to 'plain'? [Ynsfdaq?] @@ -1,6 +4,8 @@
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
r5037 4
5
+5.new
+5.reallynew
6
7
8
9
timeless@mozdev.org
record: remove superfluous space
r9461 record change 2/3 to 'plain'? [Ynsfdaq?] @@ -3,4 +8,6 @@
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
r5037 6
7
8
9
+10
+11
timeless@mozdev.org
record: remove superfluous space
r9461 record change 3/3 to 'plain'? [Ynsfdaq?]
Ronny Pfannschmidt
filelog: sort meta entries, ensure deterministic order
r10490 changeset: 15:7d137997f3a6
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
r5037 tag: tip
user: test
date: Thu Jan 01 00:00:14 1970 +0000
summary: middle-only
Ronny Pfannschmidt
filelog: sort meta entries, ensure deterministic order
r10490 diff -r c0b8e5fb0be6 -r 7d137997f3a6 plain
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
r5037 --- a/plain Thu Jan 01 00:00:13 1970 +0000
+++ b/plain Thu Jan 01 00:00:14 1970 +0000
Matt Mackall
diff: don't show function name by default...
r5863 @@ -1,5 +1,10 @@
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
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
timeless@mozdev.org
record: remove superfluous space
r9461 examine changes to 'plain'? [Ynsfdaq?] @@ -9,3 +9,5 @@
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
r5037 7
8
9
+10
+11
timeless@mozdev.org
record: remove superfluous space
r9461 record this change to 'plain'? [Ynsfdaq?]
Ronny Pfannschmidt
filelog: sort meta entries, ensure deterministic order
r10490 changeset: 16:4959e3ff13eb
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
r5037 tag: tip
user: test
date: Thu Jan 01 00:00:15 1970 +0000
summary: end-only
Ronny Pfannschmidt
filelog: sort meta entries, ensure deterministic order
r10490 diff -r 7d137997f3a6 -r 4959e3ff13eb plain
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
r5037 --- a/plain Thu Jan 01 00:00:14 1970 +0000
+++ b/plain Thu Jan 01 00:00:15 1970 +0000
Matt Mackall
diff: don't show function name by default...
r5863 @@ -9,3 +9,5 @@
Bryan O'Sullivan
Add record extension, giving darcs-like interactive hunk picking
r5037 7
8
9
+10
+11
Bryan O'Sullivan
record: work properly if invoked in a subdirectory
r5128 adding subdir/a
diff --git a/subdir/a b/subdir/a
1 hunks, 1 lines changed
timeless@mozdev.org
record: remove superfluous space
r9461 examine changes to 'subdir/a'? [Ynsfdaq?] @@ -1,1 +1,2 @@
Bryan O'Sullivan
record: work properly if invoked in a subdirectory
r5128 a
+a
timeless@mozdev.org
record: remove superfluous space
r9461 record this change to 'subdir/a'? [Ynsfdaq?]
Ronny Pfannschmidt
filelog: sort meta entries, ensure deterministic order
r10490 changeset: 18:40698cd490b2
Bryan O'Sullivan
record: work properly if invoked in a subdirectory
r5128 tag: tip
user: test
date: Thu Jan 01 00:00:16 1970 +0000
summary: subdir-change
Ronny Pfannschmidt
filelog: sort meta entries, ensure deterministic order
r10490 diff -r 661eacdc08b9 -r 40698cd490b2 subdir/a
Bryan O'Sullivan
record: work properly if invoked in a subdirectory
r5128 --- a/subdir/a Thu Jan 01 00:00:16 1970 +0000
+++ b/subdir/a Thu Jan 01 00:00:16 1970 +0000
Matt Mackall
diff: don't show function name by default...
r5863 @@ -1,1 +1,2 @@
Bryan O'Sullivan
record: work properly if invoked in a subdirectory
r5128 a
+a
Bryan O'Sullivan
record: improve docs, improve prompts
r5154 % help, quit
diff --git a/subdir/f1 b/subdir/f1
1 hunks, 1 lines changed
timeless@mozdev.org
record: remove superfluous space
r9461 examine changes to 'subdir/f1'? [Ynsfdaq?] y - record this change
Bryan O'Sullivan
record: improve docs, improve prompts
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
timeless@mozdev.org
record: remove superfluous space
r9461 examine changes to 'subdir/f1'? [Ynsfdaq?] abort: user quit
Bryan O'Sullivan
record: improve docs, improve prompts
r5154 % skip
diff --git a/subdir/f1 b/subdir/f1
1 hunks, 1 lines changed
timeless@mozdev.org
record: remove superfluous space
r9461 examine changes to 'subdir/f1'? [Ynsfdaq?] diff --git a/subdir/f2 b/subdir/f2
Bryan O'Sullivan
record: improve docs, improve prompts
r5154 1 hunks, 1 lines changed
timeless@mozdev.org
record: remove superfluous space
r9461 examine changes to 'subdir/f2'? [Ynsfdaq?] abort: response expected
Bryan O'Sullivan
record: improve docs, improve prompts
r5154 % no
diff --git a/subdir/f1 b/subdir/f1
1 hunks, 1 lines changed
timeless@mozdev.org
record: remove superfluous space
r9461 examine changes to 'subdir/f1'? [Ynsfdaq?] diff --git a/subdir/f2 b/subdir/f2
Bryan O'Sullivan
record: improve docs, improve prompts
r5154 1 hunks, 1 lines changed
timeless@mozdev.org
record: remove superfluous space
r9461 examine changes to 'subdir/f2'? [Ynsfdaq?] abort: response expected
Bryan O'Sullivan
record: improve docs, improve prompts
r5154 % f, quit
diff --git a/subdir/f1 b/subdir/f1
1 hunks, 1 lines changed
timeless@mozdev.org
record: remove superfluous space
r9461 examine changes to 'subdir/f1'? [Ynsfdaq?] diff --git a/subdir/f2 b/subdir/f2
Bryan O'Sullivan
record: improve docs, improve prompts
r5154 1 hunks, 1 lines changed
timeless@mozdev.org
record: remove superfluous space
r9461 examine changes to 'subdir/f2'? [Ynsfdaq?] abort: user quit
Bryan O'Sullivan
record: improve docs, improve prompts
r5154 % s, all
diff --git a/subdir/f1 b/subdir/f1
1 hunks, 1 lines changed
timeless@mozdev.org
record: remove superfluous space
r9461 examine changes to 'subdir/f1'? [Ynsfdaq?] diff --git a/subdir/f2 b/subdir/f2
Bryan O'Sullivan
record: improve docs, improve prompts
r5154 1 hunks, 1 lines changed
timeless@mozdev.org
record: remove superfluous space
r9461 examine changes to 'subdir/f2'? [Ynsfdaq?]
Ronny Pfannschmidt
filelog: sort meta entries, ensure deterministic order
r10490 changeset: 20:d2d8c25276a8
Bryan O'Sullivan
record: improve docs, improve prompts
r5154 tag: tip
user: test
date: Thu Jan 01 00:00:18 1970 +0000
summary: x
Ronny Pfannschmidt
filelog: sort meta entries, ensure deterministic order
r10490 diff -r 25eb2a7694fb -r d2d8c25276a8 subdir/f2
Bryan O'Sullivan
record: improve docs, improve prompts
r5154 --- a/subdir/f2 Thu Jan 01 00:00:17 1970 +0000
+++ b/subdir/f2 Thu Jan 01 00:00:18 1970 +0000
Matt Mackall
diff: don't show function name by default...
r5863 @@ -1,1 +1,2 @@
Bryan O'Sullivan
record: improve docs, improve prompts
r5154 b
+b
% f
diff --git a/subdir/f1 b/subdir/f1
1 hunks, 1 lines changed
timeless@mozdev.org
record: remove superfluous space
r9461 examine changes to 'subdir/f1'? [Ynsfdaq?]
Ronny Pfannschmidt
filelog: sort meta entries, ensure deterministic order
r10490 changeset: 21:1013f51ce32f
Bryan O'Sullivan
record: improve docs, improve prompts
r5154 tag: tip
user: test
date: Thu Jan 01 00:00:19 1970 +0000
summary: y
Ronny Pfannschmidt
filelog: sort meta entries, ensure deterministic order
r10490 diff -r d2d8c25276a8 -r 1013f51ce32f subdir/f1
Bryan O'Sullivan
record: improve docs, improve prompts
r5154 --- a/subdir/f1 Thu Jan 01 00:00:18 1970 +0000
+++ b/subdir/f1 Thu Jan 01 00:00:19 1970 +0000
Matt Mackall
diff: don't show function name by default...
r5863 @@ -1,1 +1,2 @@
Bryan O'Sullivan
record: improve docs, improve prompts
r5154 a
+a
Steve Borho
record: do not lose permission changes on commit
r7718 % preserve chmod +x
diff --git a/subdir/f1 b/subdir/f1
old mode 100644
new mode 100755
1 hunks, 1 lines changed
timeless@mozdev.org
record: remove superfluous space
r9461 examine changes to 'subdir/f1'? [Ynsfdaq?] @@ -1,2 +1,3 @@
Steve Borho
record: do not lose permission changes on commit
r7718 a
a
+a
timeless@mozdev.org
record: remove superfluous space
r9461 record this change to 'subdir/f1'? [Ynsfdaq?]
Ronny Pfannschmidt
filelog: sort meta entries, ensure deterministic order
r10490 changeset: 22:5df857735621
Steve Borho
record: do not lose permission changes on commit
r7718 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
timeless@mozdev.org
record: remove superfluous space
r9461 examine changes to 'subdir/f1'? [Ynsfdaq?] @@ -1,3 +1,4 @@
Steve Borho
record: do not lose permission changes on commit
r7718 a
a
a
+b
timeless@mozdev.org
record: remove superfluous space
r9461 record this change to 'subdir/f1'? [Ynsfdaq?]
Ronny Pfannschmidt
filelog: sort meta entries, ensure deterministic order
r10490 changeset: 23:a4ae36a78715
Steve Borho
record: do not lose permission changes on commit
r7718 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
timeless@mozdev.org
record: remove superfluous space
r9461 examine changes to 'subdir/f1'? [Ynsfdaq?] @@ -2,3 +2,4 @@
Steve Borho
record: do not lose permission changes on commit
r7718 a
a
b
+c
timeless@mozdev.org
record: remove superfluous space
r9461 record this change to 'subdir/f1'? [Ynsfdaq?]
Ronny Pfannschmidt
filelog: sort meta entries, ensure deterministic order
r10490 changeset: 24:1460f6e47966
Steve Borho
record: do not lose permission changes on commit
r7718 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
Patrick Mezard
Make mq, record and transplant honor patch.eol
r8811 % with win32ext
diff --git a/subdir/f1 b/subdir/f1
1 hunks, 1 lines changed
timeless@mozdev.org
record: remove superfluous space
r9461 examine changes to 'subdir/f1'? [Ynsfdaq?] @@ -3,3 +3,4 @@
Patrick Mezard
Make mq, record and transplant honor patch.eol
r8811 a
b
c
+d
timeless@mozdev.org
record: remove superfluous space
r9461 record this change to 'subdir/f1'? [Ynsfdaq?]
Ronny Pfannschmidt
filelog: sort meta entries, ensure deterministic order
r10490 changeset: 25:5bacc1f6e9cf
Patrick Mezard
Make mq, record and transplant honor patch.eol
r8811 tag: tip
user: test
date: Thu Jan 01 00:00:23 1970 +0000
summary: w1
Ronny Pfannschmidt
filelog: sort meta entries, ensure deterministic order
r10490 diff -r 1460f6e47966 -r 5bacc1f6e9cf subdir/f1
Patrick Mezard
Make mq, record and transplant honor patch.eol
r8811 --- 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