Mercurial Mercurial > mercurial / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-record.out
changeset 5154 67afecb8d6cc
parent 5147 c80af96943aa
child 5286 cbec83d9b0b4
equal deleted inserted replaced
5153:9555f3b9489d 5154:67afecb8d6cc 
     1 % help
 
     1 % help
 
     2 hg record [OPTION]... [FILE]...
 
     2 hg record [OPTION]... [FILE]...
 
     3 
     3 
     4 interactively select changes to commit
 
     4 interactively select changes to commit
 
       
     5 
       
     6     If a list of files is omitted, all changes reported by "hg status"
 
       
     7     will be candidates for recording.
 
       
     8 
       
     9     You will be prompted for whether to record changes to each
 
       
    10     modified file, and for files with multiple changes, for each
 
       
    11     change to use.  For each query, the following responses are
 
       
    12     possible:
 
       
    13 
       
    14     y - record this change
 
       
    15     n - skip this change
 
       
    16 
       
    17     s - skip remaining changes to this file
 
       
    18     f - record remaining changes to this file
 
       
    19 
       
    20     d - done, skip remaining changes and files
 
       
    21     a - record all changes to all remaining files
 
       
    22     q - quit, recording no changes
 
       
    23 
       
    24     ? - display help
 
     5 
    25 
     6 options:
 
    26 options:
 
     7 
    27 
     8  -A --addremove  mark new/missing files as added/removed before committing
 
    28  -A --addremove  mark new/missing files as added/removed before committing
 
     9  -I --include    include names matching the given patterns
 
    29  -I --include    include names matching the given patterns
 
    15 
    35 
    16 use "hg -v help record" to show global options
 
    36 use "hg -v help record" to show global options
 
    17 % select no files
 
    37 % select no files
 
    18 diff --git a/empty-rw b/empty-rw
 
    38 diff --git a/empty-rw b/empty-rw
 
    19 new file mode 100644
 
    39 new file mode 100644
 
    20 record changes to 'empty-rw'? [y]es [n]o no changes to record
 
    40 record changes to 'empty-rw'? [Ynsfdaq?]  no changes to record
 
    21 
    41 
    22 changeset:   -1:000000000000
 
    42 changeset:   -1:000000000000
 
    23 tag:         tip
 
    43 tag:         tip
 
    24 user:        
    44 user:        
    25 date:        Thu Jan 01 00:00:00 1970 +0000
 
    45 date:        Thu Jan 01 00:00:00 1970 +0000
 
    26 
    46 
    27 
    47 
    28 % select files but no hunks
 
    48 % select files but no hunks
 
    29 diff --git a/empty-rw b/empty-rw
 
    49 diff --git a/empty-rw b/empty-rw
 
    30 new file mode 100644
 
    50 new file mode 100644
 
    31 record changes to 'empty-rw'? [y]es [n]o transaction abort!
 
    51 record changes to 'empty-rw'? [Ynsfdaq?]  transaction abort!
 
    32 rollback completed
 
    52 rollback completed
 
    33 
    53 
    34 changeset:   -1:000000000000
 
    54 changeset:   -1:000000000000
 
    35 tag:         tip
 
    55 tag:         tip
 
    36 user:        
    56 user:        
    38 
    58 
    39 
    59 
    40 % record empty file
 
    60 % record empty file
 
    41 diff --git a/empty-rw b/empty-rw
 
    61 diff --git a/empty-rw b/empty-rw
 
    42 new file mode 100644
 
    62 new file mode 100644
 
    43 record changes to 'empty-rw'? [y]es [n]o 
    63 record changes to 'empty-rw'? [Ynsfdaq?]  
    44 changeset:   0:c0708cf4e46e
 
    64 changeset:   0:c0708cf4e46e
 
    45 tag:         tip
 
    65 tag:         tip
 
    46 user:        test
 
    66 user:        test
 
    47 date:        Thu Jan 01 00:00:00 1970 +0000
 
    67 date:        Thu Jan 01 00:00:00 1970 +0000
 
    48 summary:     empty
 
    68 summary:     empty
 
    50 
    70 
    51 % rename empty file
 
    71 % rename empty file
 
    52 diff --git a/empty-rw b/empty-rename
 
    72 diff --git a/empty-rw b/empty-rename
 
    53 rename from empty-rw
 
    73 rename from empty-rw
 
    54 rename to empty-rename
 
    74 rename to empty-rename
 
    55 record changes to 'empty-rw' and 'empty-rename'? [y]es [n]o 
    75 record changes to 'empty-rw' and 'empty-rename'? [Ynsfdaq?]  
    56 changeset:   1:df251d174da3
 
    76 changeset:   1:df251d174da3
 
    57 tag:         tip
 
    77 tag:         tip
 
    58 user:        test
 
    78 user:        test
 
    59 date:        Thu Jan 01 00:00:01 1970 +0000
 
    79 date:        Thu Jan 01 00:00:01 1970 +0000
 
    60 summary:     rename
 
    80 summary:     rename
 
    62 
    82 
    63 % copy empty file
 
    83 % copy empty file
 
    64 diff --git a/empty-rename b/empty-copy
 
    84 diff --git a/empty-rename b/empty-copy
 
    65 copy from empty-rename
 
    85 copy from empty-rename
 
    66 copy to empty-copy
 
    86 copy to empty-copy
 
    67 record changes to 'empty-rename' and 'empty-copy'? [y]es [n]o 
    87 record changes to 'empty-rename' and 'empty-copy'? [Ynsfdaq?]  
    68 changeset:   2:b63ea3939f8d
 
    88 changeset:   2:b63ea3939f8d
 
    69 tag:         tip
 
    89 tag:         tip
 
    70 user:        test
 
    90 user:        test
 
    71 date:        Thu Jan 01 00:00:02 1970 +0000
 
    91 date:        Thu Jan 01 00:00:02 1970 +0000
 
    72 summary:     copy
 
    92 summary:     copy
 
    73 
    93 
    74 
    94 
    75 % delete empty file
 
    95 % delete empty file
 
    76 diff --git a/empty-copy b/empty-copy
 
    96 diff --git a/empty-copy b/empty-copy
 
    77 deleted file mode 100644
 
    97 deleted file mode 100644
 
    78 record changes to 'empty-copy'? [y]es [n]o 
    98 record changes to 'empty-copy'? [Ynsfdaq?]  
    79 changeset:   3:a2546574bce9
 
    99 changeset:   3:a2546574bce9
 
    80 tag:         tip
 
   100 tag:         tip
 
    81 user:        test
 
   101 user:        test
 
    82 date:        Thu Jan 01 00:00:03 1970 +0000
 
   102 date:        Thu Jan 01 00:00:03 1970 +0000
 
    83 summary:     delete
 
   103 summary:     delete
 
    85 
   105 
    86 % add binary file
 
   106 % add binary file
 
    87 diff --git a/tip.bundle b/tip.bundle
 
   107 diff --git a/tip.bundle b/tip.bundle
 
    88 new file mode 100644
 
   108 new file mode 100644
 
    89 this is a binary file
 
   109 this is a binary file
 
    90 record changes to 'tip.bundle'? [y]es [n]o 
   110 record changes to 'tip.bundle'? [Ynsfdaq?]  
    91 changeset:   4:9e998a545a8b
 
   111 changeset:   4:9e998a545a8b
 
    92 tag:         tip
 
   112 tag:         tip
 
    93 user:        test
 
   113 user:        test
 
    94 date:        Thu Jan 01 00:00:04 1970 +0000
 
   114 date:        Thu Jan 01 00:00:04 1970 +0000
 
    95 summary:     binary
 
   115 summary:     binary
 
    98 Binary file tip.bundle has changed
 
   118 Binary file tip.bundle has changed
 
    99 
   119 
   100 % change binary file
 
   120 % change binary file
 
   101 diff --git a/tip.bundle b/tip.bundle
 
   121 diff --git a/tip.bundle b/tip.bundle
 
   102 this modifies a binary file (all or nothing)
 
   122 this modifies a binary file (all or nothing)
 
   103 record changes to 'tip.bundle'? [y]es [n]o 
   123 record changes to 'tip.bundle'? [Ynsfdaq?]  
   104 changeset:   5:93d05561507d
 
   124 changeset:   5:93d05561507d
 
   105 tag:         tip
 
   125 tag:         tip
 
   106 user:        test
 
   126 user:        test
 
   107 date:        Thu Jan 01 00:00:05 1970 +0000
 
   127 date:        Thu Jan 01 00:00:05 1970 +0000
 
   108 summary:     binary-change
 
   128 summary:     binary-change
 
   113 % rename and change binary file
 
   133 % rename and change binary file
 
   114 diff --git a/tip.bundle b/top.bundle
 
   134 diff --git a/tip.bundle b/top.bundle
 
   115 rename from tip.bundle
 
   135 rename from tip.bundle
 
   116 rename to top.bundle
 
   136 rename to top.bundle
 
   117 this modifies a binary file (all or nothing)
 
   137 this modifies a binary file (all or nothing)
 
   118 record changes to 'tip.bundle' and 'top.bundle'? [y]es [n]o 
   138 record changes to 'tip.bundle' and 'top.bundle'? [Ynsfdaq?]  
   119 changeset:   6:699cc1bea9aa
 
   139 changeset:   6:699cc1bea9aa
 
   120 tag:         tip
 
   140 tag:         tip
 
   121 user:        test
 
   141 user:        test
 
   122 date:        Thu Jan 01 00:00:06 1970 +0000
 
   142 date:        Thu Jan 01 00:00:06 1970 +0000
 
   123 summary:     binary-change-rename
 
   143 summary:     binary-change-rename
 
   128 Binary file top.bundle has changed
 
   148 Binary file top.bundle has changed
 
   129 
   149 
   130 % add plain file
 
   150 % add plain file
 
   131 diff --git a/plain b/plain
 
   151 diff --git a/plain b/plain
 
   132 new file mode 100644
 
   152 new file mode 100644
 
   133 record changes to 'plain'? [y]es [n]o 
   153 record changes to 'plain'? [Ynsfdaq?]  
   134 changeset:   7:118ed744216b
 
   154 changeset:   7:118ed744216b
 
   135 tag:         tip
 
   155 tag:         tip
 
   136 user:        test
 
   156 user:        test
 
   137 date:        Thu Jan 01 00:00:07 1970 +0000
 
   157 date:        Thu Jan 01 00:00:07 1970 +0000
 
   138 summary:     plain
 
   158 summary:     plain
 
   153 +10
 
   173 +10
 
   154 
   174 
   155 % modify end of plain file
 
   175 % modify end of plain file
 
   156 diff --git a/plain b/plain
 
   176 diff --git a/plain b/plain
 
   157 1 hunks, 1 lines changed
 
   177 1 hunks, 1 lines changed
 
   158 record changes to 'plain'? [y]es [n]o @@ -8,3 +8,4 @@ 8
 
   178 record changes to 'plain'? [Ynsfdaq?]  @@ -8,3 +8,4 @@ 8
 
   159  8
 
   179  8
 
   160  9
 
   180  9
 
   161  10
 
   181  10
 
   162 +11
 
   182 +11
 
   163 record this change to 'plain'? [y]es [n]o % modify end of plain file, no EOL
 
   183 record this change to 'plain'? [Ynsfdaq?]  % modify end of plain file, no EOL
 
   164 diff --git a/plain b/plain
 
   184 diff --git a/plain b/plain
 
   165 1 hunks, 1 lines changed
 
   185 1 hunks, 1 lines changed
 
   166 record changes to 'plain'? [y]es [n]o @@ -9,3 +9,4 @@ 9
 
   186 record changes to 'plain'? [Ynsfdaq?]  @@ -9,3 +9,4 @@ 9
 
   167  9
 
   187  9
 
   168  10
 
   188  10
 
   169  11
 
   189  11
 
   170 +cf81a2760718a74d44c0c2eecb72f659e63a69c5
 
   190 +cf81a2760718a74d44c0c2eecb72f659e63a69c5
 
   171 \ No newline at end of file
 
   191 \ No newline at end of file
 
   172 record this change to 'plain'? [y]es [n]o % modify end of plain file, add EOL
 
   192 record this change to 'plain'? [Ynsfdaq?]  % modify end of plain file, add EOL
 
   173 diff --git a/plain b/plain
 
   193 diff --git a/plain b/plain
 
   174 1 hunks, 2 lines changed
 
   194 1 hunks, 2 lines changed
 
   175 record changes to 'plain'? [y]es [n]o @@ -9,4 +9,4 @@ 9
 
   195 record changes to 'plain'? [Ynsfdaq?]  @@ -9,4 +9,4 @@ 9
 
   176  9
 
   196  9
 
   177  10
 
   197  10
 
   178  11
 
   198  11
 
   179 -cf81a2760718a74d44c0c2eecb72f659e63a69c5
 
   199 -cf81a2760718a74d44c0c2eecb72f659e63a69c5
 
   180 \ No newline at end of file
 
   200 \ No newline at end of file
 
   181 +cf81a2760718a74d44c0c2eecb72f659e63a69c5
 
   201 +cf81a2760718a74d44c0c2eecb72f659e63a69c5
 
   182 record this change to 'plain'? [y]es [n]o % modify beginning, trim end, record both
 
   202 record this change to 'plain'? [Ynsfdaq?]  % modify beginning, trim end, record both
 
   183 diff --git a/plain b/plain
 
   203 diff --git a/plain b/plain
 
   184 2 hunks, 4 lines changed
 
   204 2 hunks, 4 lines changed
 
   185 record changes to 'plain'? [y]es [n]o @@ -1,4 +1,4 @@ 1
 
   205 record changes to 'plain'? [Ynsfdaq?]  @@ -1,4 +1,4 @@ 1
 
   186 -1
 
   206 -1
 
   187 +2
 
   207 +2
 
   188  2
 
   208  2
 
   189  3
 
   209  3
 
   190  4
 
   210  4
 
   191 record this change to 'plain'? [y]es [n]o @@ -8,5 +8,3 @@ 8
 
   211 record this change to 'plain'? [Ynsfdaq?]  @@ -8,5 +8,3 @@ 8
 
   192  8
 
   212  8
 
   193  9
 
   213  9
 
   194  10
 
   214  10
 
   195 -11
 
   215 -11
 
   196 -cf81a2760718a74d44c0c2eecb72f659e63a69c5
 
   216 -cf81a2760718a74d44c0c2eecb72f659e63a69c5
 
   197 record this change to 'plain'? [y]es [n]o 
   217 record this change to 'plain'? [Ynsfdaq?]  
   198 changeset:   11:d09ab1967dab
 
   218 changeset:   11:d09ab1967dab
 
   199 tag:         tip
 
   219 tag:         tip
 
   200 user:        test
 
   220 user:        test
 
   201 date:        Thu Jan 01 00:00:10 1970 +0000
 
   221 date:        Thu Jan 01 00:00:10 1970 +0000
 
   202 summary:     begin-and-end
 
   222 summary:     begin-and-end
 
   219 
   239 
   220 % trim beginning, modify end
 
   240 % trim beginning, modify end
 
   221 % record end
 
   241 % record end
 
   222 diff --git a/plain b/plain
 
   242 diff --git a/plain b/plain
 
   223 2 hunks, 5 lines changed
 
   243 2 hunks, 5 lines changed
 
   224 record changes to 'plain'? [y]es [n]o @@ -1,9 +1,6 @@ 2
 
   244 record changes to 'plain'? [Ynsfdaq?]  @@ -1,9 +1,6 @@ 2
 
   225 -2
 
   245 -2
 
   226 -2
 
   246 -2
 
   227 -3
 
   247 -3
 
   228  4
 
   248  4
 
   229  5
 
   249  5
 
   230  6
 
   250  6
 
   231  7
 
   251  7
 
   232  8
 
   252  8
 
   233  9
 
   253  9
 
   234 record this change to 'plain'? [y]es [n]o @@ -4,7 +1,7 @@
 
   254 record this change to 'plain'? [Ynsfdaq?]  @@ -4,7 +1,7 @@
 
   235  4
 
   255  4
 
   236  5
 
   256  5
 
   237  6
 
   257  6
 
   238  7
 
   258  7
 
   239  8
 
   259  8
 
   240  9
 
   260  9
 
   241 -10
 
   261 -10
 
   242 +10.new
 
   262 +10.new
 
   243 record this change to 'plain'? [y]es [n]o 
   263 record this change to 'plain'? [Ynsfdaq?]  
   244 changeset:   12:44516c9708ae
 
   264 changeset:   12:44516c9708ae
 
   245 tag:         tip
 
   265 tag:         tip
 
   246 user:        test
 
   266 user:        test
 
   247 date:        Thu Jan 01 00:00:11 1970 +0000
 
   267 date:        Thu Jan 01 00:00:11 1970 +0000
 
   248 summary:     end-only
 
   268 summary:     end-only
 
   258 +10.new
 
   278 +10.new
 
   259 
   279 
   260 % record beginning
 
   280 % record beginning
 
   261 diff --git a/plain b/plain
 
   281 diff --git a/plain b/plain
 
   262 1 hunks, 3 lines changed
 
   282 1 hunks, 3 lines changed
 
   263 record changes to 'plain'? [y]es [n]o @@ -1,6 +1,3 @@ 2
 
   283 record changes to 'plain'? [Ynsfdaq?]  @@ -1,6 +1,3 @@ 2
 
   264 -2
 
   284 -2
 
   265 -2
 
   285 -2
 
   266 -3
 
   286 -3
 
   267  4
 
   287  4
 
   268  5
 
   288  5
 
   269  6
 
   289  6
 
   270 record this change to 'plain'? [y]es [n]o 
   290 record this change to 'plain'? [Ynsfdaq?]  
   271 changeset:   13:3ebbace64a8d
 
   291 changeset:   13:3ebbace64a8d
 
   272 tag:         tip
 
   292 tag:         tip
 
   273 user:        test
 
   293 user:        test
 
   274 date:        Thu Jan 01 00:00:12 1970 +0000
 
   294 date:        Thu Jan 01 00:00:12 1970 +0000
 
   275 summary:     begin-only
 
   295 summary:     begin-only
 
   287 
   307 
   288 % add to beginning, trim from end
 
   308 % add to beginning, trim from end
 
   289 % record end
 
   309 % record end
 
   290 diff --git a/plain b/plain
 
   310 diff --git a/plain b/plain
 
   291 2 hunks, 4 lines changed
 
   311 2 hunks, 4 lines changed
 
   292 record changes to 'plain'? [y]es [n]o @@ -1,6 +1,9 @@ 4
 
   312 record changes to 'plain'? [Ynsfdaq?]  @@ -1,6 +1,9 @@ 4
 
   293 +1
 
   313 +1
 
   294 +2
 
   314 +2
 
   295 +3
 
   315 +3
 
   296  4
 
   316  4
 
   297  5
 
   317  5
 
   298  6
 
   318  6
 
   299  7
 
   319  7
 
   300  8
 
   320  8
 
   301  9
 
   321  9
 
   302 record this change to 'plain'? [y]es [n]o @@ -1,7 +4,6 @@
 
   322 record this change to 'plain'? [Ynsfdaq?]  @@ -1,7 +4,6 @@
 
   303  4
 
   323  4
 
   304  5
 
   324  5
 
   305  6
 
   325  6
 
   306  7
 
   326  7
 
   307  8
 
   327  8
 
   308  9
 
   328  9
 
   309 -10.new
 
   329 -10.new
 
   310 record this change to 'plain'? [y]es [n]o % add to beginning, middle, end
 
   330 record this change to 'plain'? [Ynsfdaq?]  % add to beginning, middle, end
 
   311 % record beginning, middle
 
   331 % record beginning, middle
 
   312 diff --git a/plain b/plain
 
   332 diff --git a/plain b/plain
 
   313 3 hunks, 7 lines changed
 
   333 3 hunks, 7 lines changed
 
   314 record changes to 'plain'? [y]es [n]o @@ -1,2 +1,5 @@ 4
 
   334 record changes to 'plain'? [Ynsfdaq?]  @@ -1,2 +1,5 @@ 4
 
   315 +1
 
   335 +1
 
   316 +2
 
   336 +2
 
   317 +3
 
   337 +3
 
   318  4
 
   338  4
 
   319  5
 
   339  5
 
   320 record this change to 'plain'? [y]es [n]o @@ -1,6 +4,8 @@
 
   340 record this change to 'plain'? [Ynsfdaq?]  @@ -1,6 +4,8 @@
 
   321  4
 
   341  4
 
   322  5
 
   342  5
 
   323 +5.new
 
   343 +5.new
 
   324 +5.reallynew
 
   344 +5.reallynew
 
   325  6
 
   345  6
 
   326  7
 
   346  7
 
   327  8
 
   347  8
 
   328  9
 
   348  9
 
   329 record this change to 'plain'? [y]es [n]o @@ -3,4 +8,6 @@
 
   349 record this change to 'plain'? [Ynsfdaq?]  @@ -3,4 +8,6 @@
 
   330  6
 
   350  6
 
   331  7
 
   351  7
 
   332  8
 
   352  8
 
   333  9
 
   353  9
 
   334 +10
 
   354 +10
 
   335 +11
 
   355 +11
 
   336 record this change to 'plain'? [y]es [n]o 
   356 record this change to 'plain'? [Ynsfdaq?]  
   337 changeset:   15:c1c639d8b268
 
   357 changeset:   15:c1c639d8b268
 
   338 tag:         tip
 
   358 tag:         tip
 
   339 user:        test
 
   359 user:        test
 
   340 date:        Thu Jan 01 00:00:14 1970 +0000
 
   360 date:        Thu Jan 01 00:00:14 1970 +0000
 
   341 summary:     middle-only
 
   361 summary:     middle-only
 
   356  8
 
   376  8
 
   357 
   377 
   358 % record end
 
   378 % record end
 
   359 diff --git a/plain b/plain
 
   379 diff --git a/plain b/plain
 
   360 1 hunks, 2 lines changed
 
   380 1 hunks, 2 lines changed
 
   361 record changes to 'plain'? [y]es [n]o @@ -9,3 +9,5 @@ 7
 
   381 record changes to 'plain'? [Ynsfdaq?]  @@ -9,3 +9,5 @@ 7
 
   362  7
 
   382  7
 
   363  8
 
   383  8
 
   364  9
 
   384  9
 
   365 +10
 
   385 +10
 
   366 +11
 
   386 +11
 
   367 record this change to 'plain'? [y]es [n]o 
   387 record this change to 'plain'? [Ynsfdaq?]  
   368 changeset:   16:80b74bbc7808
 
   388 changeset:   16:80b74bbc7808
 
   369 tag:         tip
 
   389 tag:         tip
 
   370 user:        test
 
   390 user:        test
 
   371 date:        Thu Jan 01 00:00:15 1970 +0000
 
   391 date:        Thu Jan 01 00:00:15 1970 +0000
 
   372 summary:     end-only
 
   392 summary:     end-only
 
   382 +11
 
   402 +11
 
   383 
   403 
   384 adding subdir/a
 
   404 adding subdir/a
 
   385 diff --git a/subdir/a b/subdir/a
 
   405 diff --git a/subdir/a b/subdir/a
 
   386 1 hunks, 1 lines changed
 
   406 1 hunks, 1 lines changed
 
   387 record changes to 'subdir/a'? [y]es [n]o @@ -1,1 +1,2 @@ a
 
   407 record changes to 'subdir/a'? [Ynsfdaq?]  @@ -1,1 +1,2 @@ a
 
   388  a
 
   408  a
 
   389 +a
 
   409 +a
 
   390 record this change to 'subdir/a'? [y]es [n]o 
   410 record this change to 'subdir/a'? [Ynsfdaq?]  
   391 changeset:   18:33ff5c4fb017
 
   411 changeset:   18:33ff5c4fb017
 
   392 tag:         tip
 
   412 tag:         tip
 
   393 user:        test
 
   413 user:        test
 
   394 date:        Thu Jan 01 00:00:16 1970 +0000
 
   414 date:        Thu Jan 01 00:00:16 1970 +0000
 
   395 summary:     subdir-change
 
   415 summary:     subdir-change
 
   399 +++ b/subdir/a	Thu Jan 01 00:00:16 1970 +0000
 
   419 +++ b/subdir/a	Thu Jan 01 00:00:16 1970 +0000
 
   400 @@ -1,1 +1,2 @@ a
 
   420 @@ -1,1 +1,2 @@ a
 
   401  a
 
   421  a
 
   402 +a
 
   422 +a
 
   403 
   423 
       
   424 % help, quit
 
       
   425 diff --git a/subdir/f1 b/subdir/f1
 
       
   426 1 hunks, 1 lines changed
 
       
   427 record changes to 'subdir/f1'? [Ynsfdaq?]  y - record this change
 
       
   428 n - skip this change
 
       
   429 s - skip remaining changes to this file
 
       
   430 f - record remaining changes to this file
 
       
   431 d - done, skip remaining changes and files
 
       
   432 a - record all changes to all remaining files
 
       
   433 q - quit, recording no changes
 
       
   434 ? - display help
 
       
   435 record changes to 'subdir/f1'? [Ynsfdaq?]  abort: user quit
 
       
   436 % skip
 
       
   437 diff --git a/subdir/f1 b/subdir/f1
 
       
   438 1 hunks, 1 lines changed
 
       
   439 record changes to 'subdir/f1'? [Ynsfdaq?]  diff --git a/subdir/f2 b/subdir/f2
 
       
   440 1 hunks, 1 lines changed
 
       
   441 record changes to 'subdir/f2'? [Ynsfdaq?]  abort: response expected
 
       
   442 % no
 
       
   443 diff --git a/subdir/f1 b/subdir/f1
 
       
   444 1 hunks, 1 lines changed
 
       
   445 record changes to 'subdir/f1'? [Ynsfdaq?]  diff --git a/subdir/f2 b/subdir/f2
 
       
   446 1 hunks, 1 lines changed
 
       
   447 record changes to 'subdir/f2'? [Ynsfdaq?]  abort: response expected
 
       
   448 % f, quit
 
       
   449 diff --git a/subdir/f1 b/subdir/f1
 
       
   450 1 hunks, 1 lines changed
 
       
   451 record changes to 'subdir/f1'? [Ynsfdaq?]  diff --git a/subdir/f2 b/subdir/f2
 
       
   452 1 hunks, 1 lines changed
 
       
   453 record changes to 'subdir/f2'? [Ynsfdaq?]  abort: user quit
 
       
   454 % s, all
 
       
   455 diff --git a/subdir/f1 b/subdir/f1
 
       
   456 1 hunks, 1 lines changed
 
       
   457 record changes to 'subdir/f1'? [Ynsfdaq?]  diff --git a/subdir/f2 b/subdir/f2
 
       
   458 1 hunks, 1 lines changed
 
       
   459 record changes to 'subdir/f2'? [Ynsfdaq?]  
       
   460 changeset:   20:094183e04b7c
 
       
   461 tag:         tip
 
       
   462 user:        test
 
       
   463 date:        Thu Jan 01 00:00:18 1970 +0000
 
       
   464 summary:     x
 
       
   465 
       
   466 diff -r f9e855cd9374 -r 094183e04b7c subdir/f2
 
       
   467 --- a/subdir/f2	Thu Jan 01 00:00:17 1970 +0000
 
       
   468 +++ b/subdir/f2	Thu Jan 01 00:00:18 1970 +0000
 
       
   469 @@ -1,1 +1,2 @@ b
 
       
   470  b
 
       
   471 +b
 
       
   472 
       
   473 % f
 
       
   474 diff --git a/subdir/f1 b/subdir/f1
 
       
   475 1 hunks, 1 lines changed
 
       
   476 record changes to 'subdir/f1'? [Ynsfdaq?]  
       
   477 changeset:   21:38164785b0ef
 
       
   478 tag:         tip
 
       
   479 user:        test
 
       
   480 date:        Thu Jan 01 00:00:19 1970 +0000
 
       
   481 summary:     y
 
       
   482 
       
   483 diff -r 094183e04b7c -r 38164785b0ef subdir/f1
 
       
   484 --- a/subdir/f1	Thu Jan 01 00:00:18 1970 +0000
 
       
   485 +++ b/subdir/f1	Thu Jan 01 00:00:19 1970 +0000
 
       
   486 @@ -1,1 +1,2 @@ a
 
       
   487  a
 
       
   488 +a
 
       
   489
mercurial