Mercurial > hg > mercurial-crew-with-dirclash

changeset 5286:cbec83d9b0b4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update test-record for 3ef190234b55
author Brendan Cully <brendan@kublai.com>
date Thu, 06 Sep 2007 18:12:36 -0700
parents 3ef190234b55
children c6f932d3e0f6
files tests/test-record.out
diffstat 1 files changed, 31 insertions(+), 31 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-record.out
+++ b/tests/test-record.out
@@ -37,7 +37,7 @@ use "hg -v help record" to show global o
 % select no files
 diff --git a/empty-rw b/empty-rw
 new file mode 100644
-record changes to 'empty-rw'? [Ynsfdaq?]  no changes to record
+examine changes to 'empty-rw'? [Ynsfdaq?]  no changes to record
 
 changeset:   -1:000000000000
 tag:         tip
@@ -48,7 +48,7 @@ date:        Thu Jan 01 00:00:00 1970 +0
 % select files but no hunks
 diff --git a/empty-rw b/empty-rw
 new file mode 100644
-record changes to 'empty-rw'? [Ynsfdaq?]  transaction abort!
+examine changes to 'empty-rw'? [Ynsfdaq?]  transaction abort!
 rollback completed
 
 changeset:   -1:000000000000
@@ -60,7 +60,7 @@ date:        Thu Jan 01 00:00:00 1970 +0
 % record empty file
 diff --git a/empty-rw b/empty-rw
 new file mode 100644
-record changes to 'empty-rw'? [Ynsfdaq?]  
+examine changes to 'empty-rw'? [Ynsfdaq?]  
 changeset:   0:c0708cf4e46e
 tag:         tip
 user:        test
@@ -72,7 +72,7 @@ summary:     empty
 diff --git a/empty-rw b/empty-rename
 rename from empty-rw
 rename to empty-rename
-record changes to 'empty-rw' and 'empty-rename'? [Ynsfdaq?]  
+examine changes to 'empty-rw' and 'empty-rename'? [Ynsfdaq?]  
 changeset:   1:df251d174da3
 tag:         tip
 user:        test
@@ -84,7 +84,7 @@ summary:     rename
 diff --git a/empty-rename b/empty-copy
 copy from empty-rename
 copy to empty-copy
-record changes to 'empty-rename' and 'empty-copy'? [Ynsfdaq?]  
+examine changes to 'empty-rename' and 'empty-copy'? [Ynsfdaq?]  
 changeset:   2:b63ea3939f8d
 tag:         tip
 user:        test
@@ -95,7 +95,7 @@ summary:     copy
 % delete empty file
 diff --git a/empty-copy b/empty-copy
 deleted file mode 100644
-record changes to 'empty-copy'? [Ynsfdaq?]  
+examine changes to 'empty-copy'? [Ynsfdaq?]  
 changeset:   3:a2546574bce9
 tag:         tip
 user:        test
@@ -107,7 +107,7 @@ summary:     delete
 diff --git a/tip.bundle b/tip.bundle
 new file mode 100644
 this is a binary file
-record changes to 'tip.bundle'? [Ynsfdaq?]  
+examine changes to 'tip.bundle'? [Ynsfdaq?]  
 changeset:   4:9e998a545a8b
 tag:         tip
 user:        test
@@ -120,7 +120,7 @@ Binary file tip.bundle has changed
 % change binary file
 diff --git a/tip.bundle b/tip.bundle
 this modifies a binary file (all or nothing)
-record changes to 'tip.bundle'? [Ynsfdaq?]  
+examine changes to 'tip.bundle'? [Ynsfdaq?]  
 changeset:   5:93d05561507d
 tag:         tip
 user:        test
@@ -135,7 +135,7 @@ diff --git a/tip.bundle b/top.bundle
 rename from tip.bundle
 rename to top.bundle
 this modifies a binary file (all or nothing)
-record changes to 'tip.bundle' and 'top.bundle'? [Ynsfdaq?]  
+examine changes to 'tip.bundle' and 'top.bundle'? [Ynsfdaq?]  
 changeset:   6:699cc1bea9aa
 tag:         tip
 user:        test
@@ -150,7 +150,7 @@ Binary file top.bundle has changed
 % add plain file
 diff --git a/plain b/plain
 new file mode 100644
-record changes to 'plain'? [Ynsfdaq?]  
+examine changes to 'plain'? [Ynsfdaq?]  
 changeset:   7:118ed744216b
 tag:         tip
 user:        test
@@ -175,7 +175,7 @@ diff -r 699cc1bea9aa -r 118ed744216b pla
 % modify end of plain file
 diff --git a/plain b/plain
 1 hunks, 1 lines changed
-record changes to 'plain'? [Ynsfdaq?]  @@ -8,3 +8,4 @@ 8
+examine changes to 'plain'? [Ynsfdaq?]  @@ -8,3 +8,4 @@ 8
  8
  9
  10
@@ -183,7 +183,7 @@ record changes to 'plain'? [Ynsfdaq?]  @
 record this change to 'plain'? [Ynsfdaq?]  % modify end of plain file, no EOL
 diff --git a/plain b/plain
 1 hunks, 1 lines changed
-record changes to 'plain'? [Ynsfdaq?]  @@ -9,3 +9,4 @@ 9
+examine changes to 'plain'? [Ynsfdaq?]  @@ -9,3 +9,4 @@ 9
  9
  10
  11
@@ -192,7 +192,7 @@ record changes to 'plain'? [Ynsfdaq?]  @
 record this change to 'plain'? [Ynsfdaq?]  % modify end of plain file, add EOL
 diff --git a/plain b/plain
 1 hunks, 2 lines changed
-record changes to 'plain'? [Ynsfdaq?]  @@ -9,4 +9,4 @@ 9
+examine changes to 'plain'? [Ynsfdaq?]  @@ -9,4 +9,4 @@ 9
  9
  10
  11
@@ -202,7 +202,7 @@ record changes to 'plain'? [Ynsfdaq?]  @
 record this change to 'plain'? [Ynsfdaq?]  % modify beginning, trim end, record both
 diff --git a/plain b/plain
 2 hunks, 4 lines changed
-record changes to 'plain'? [Ynsfdaq?]  @@ -1,4 +1,4 @@ 1
+examine changes to 'plain'? [Ynsfdaq?]  @@ -1,4 +1,4 @@ 1
 -1
 +2
  2
@@ -241,7 +241,7 @@ diff -r e2ecd9b0b78d -r d09ab1967dab pla
 % record end
 diff --git a/plain b/plain
 2 hunks, 5 lines changed
-record changes to 'plain'? [Ynsfdaq?]  @@ -1,9 +1,6 @@ 2
+examine changes to 'plain'? [Ynsfdaq?]  @@ -1,9 +1,6 @@ 2
 -2
 -2
 -3
@@ -280,7 +280,7 @@ diff -r d09ab1967dab -r 44516c9708ae pla
 % record beginning
 diff --git a/plain b/plain
 1 hunks, 3 lines changed
-record changes to 'plain'? [Ynsfdaq?]  @@ -1,6 +1,3 @@ 2
+examine changes to 'plain'? [Ynsfdaq?]  @@ -1,6 +1,3 @@ 2
 -2
 -2
 -3
@@ -309,7 +309,7 @@ diff -r 44516c9708ae -r 3ebbace64a8d pla
 % record end
 diff --git a/plain b/plain
 2 hunks, 4 lines changed
-record changes to 'plain'? [Ynsfdaq?]  @@ -1,6 +1,9 @@ 4
+examine changes to 'plain'? [Ynsfdaq?]  @@ -1,6 +1,9 @@ 4
 +1
 +2
 +3
@@ -331,7 +331,7 @@ record this change to 'plain'? [Ynsfdaq?
 % record beginning, middle
 diff --git a/plain b/plain
 3 hunks, 7 lines changed
-record changes to 'plain'? [Ynsfdaq?]  @@ -1,2 +1,5 @@ 4
+examine changes to 'plain'? [Ynsfdaq?]  @@ -1,2 +1,5 @@ 4
 +1
 +2
 +3
@@ -378,7 +378,7 @@ diff -r efc0dad7bd9f -r c1c639d8b268 pla
 % record end
 diff --git a/plain b/plain
 1 hunks, 2 lines changed
-record changes to 'plain'? [Ynsfdaq?]  @@ -9,3 +9,5 @@ 7
+examine changes to 'plain'? [Ynsfdaq?]  @@ -9,3 +9,5 @@ 7
  7
  8
  9
@@ -404,7 +404,7 @@ diff -r c1c639d8b268 -r 80b74bbc7808 pla
 adding subdir/a
 diff --git a/subdir/a b/subdir/a
 1 hunks, 1 lines changed
-record changes to 'subdir/a'? [Ynsfdaq?]  @@ -1,1 +1,2 @@ a
+examine changes to 'subdir/a'? [Ynsfdaq?]  @@ -1,1 +1,2 @@ a
  a
 +a
 record this change to 'subdir/a'? [Ynsfdaq?]  
@@ -424,7 +424,7 @@ diff -r aecf2b2ea83c -r 33ff5c4fb017 sub
 % help, quit
 diff --git a/subdir/f1 b/subdir/f1
 1 hunks, 1 lines changed
-record changes to 'subdir/f1'? [Ynsfdaq?]  y - record this change
+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
@@ -432,31 +432,31 @@ d - done, skip remaining changes and fil
 a - record all changes to all remaining files
 q - quit, recording no changes
 ? - display help
-record changes to 'subdir/f1'? [Ynsfdaq?]  abort: user quit
+examine changes to 'subdir/f1'? [Ynsfdaq?]  abort: user quit
 % skip
 diff --git a/subdir/f1 b/subdir/f1
 1 hunks, 1 lines changed
-record changes to 'subdir/f1'? [Ynsfdaq?]  diff --git a/subdir/f2 b/subdir/f2
+examine changes to 'subdir/f1'? [Ynsfdaq?]  diff --git a/subdir/f2 b/subdir/f2
 1 hunks, 1 lines changed
-record changes to 'subdir/f2'? [Ynsfdaq?]  abort: response expected
+examine changes to 'subdir/f2'? [Ynsfdaq?]  abort: response expected
 % no
 diff --git a/subdir/f1 b/subdir/f1
 1 hunks, 1 lines changed
-record changes to 'subdir/f1'? [Ynsfdaq?]  diff --git a/subdir/f2 b/subdir/f2
+examine changes to 'subdir/f1'? [Ynsfdaq?]  diff --git a/subdir/f2 b/subdir/f2
 1 hunks, 1 lines changed
-record changes to 'subdir/f2'? [Ynsfdaq?]  abort: response expected
+examine changes to 'subdir/f2'? [Ynsfdaq?]  abort: response expected
 % f, quit
 diff --git a/subdir/f1 b/subdir/f1
 1 hunks, 1 lines changed
-record changes to 'subdir/f1'? [Ynsfdaq?]  diff --git a/subdir/f2 b/subdir/f2
+examine changes to 'subdir/f1'? [Ynsfdaq?]  diff --git a/subdir/f2 b/subdir/f2
 1 hunks, 1 lines changed
-record changes to 'subdir/f2'? [Ynsfdaq?]  abort: user quit
+examine changes to 'subdir/f2'? [Ynsfdaq?]  abort: user quit
 % s, all
 diff --git a/subdir/f1 b/subdir/f1
 1 hunks, 1 lines changed
-record changes to 'subdir/f1'? [Ynsfdaq?]  diff --git a/subdir/f2 b/subdir/f2
+examine changes to 'subdir/f1'? [Ynsfdaq?]  diff --git a/subdir/f2 b/subdir/f2
 1 hunks, 1 lines changed
-record changes to 'subdir/f2'? [Ynsfdaq?]  
+examine changes to 'subdir/f2'? [Ynsfdaq?]  
 changeset:   20:094183e04b7c
 tag:         tip
 user:        test
@@ -473,7 +473,7 @@ diff -r f9e855cd9374 -r 094183e04b7c sub
 % f
 diff --git a/subdir/f1 b/subdir/f1
 1 hunks, 1 lines changed
-record changes to 'subdir/f1'? [Ynsfdaq?]  
+examine changes to 'subdir/f1'? [Ynsfdaq?]  
 changeset:   21:38164785b0ef
 tag:         tip
 user:        test