Mercurial Mercurial > hg > mercurial-crew-with-dirclash / 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 5286 cbec83d9b0b4
parent 5137 67afecb8d6cc
equal deleted inserted replaced
5285:3ef190234b55 5286:cbec83d9b0b4 
    35 
    35 
    36 use "hg -v help record" to show global options
 
    36 use "hg -v help record" to show global options
 
    37 % select no files
 
    37 % select no files
 
    38 diff --git a/empty-rw b/empty-rw
 
    38 diff --git a/empty-rw b/empty-rw
 
    39 new file mode 100644
 
    39 new file mode 100644
 
    40 record changes to 'empty-rw'? [Ynsfdaq?]  no changes to record
 
    40 examine changes to 'empty-rw'? [Ynsfdaq?]  no changes to record
 
    41 
    41 
    42 changeset:   -1:000000000000
 
    42 changeset:   -1:000000000000
 
    43 tag:         tip
 
    43 tag:         tip
 
    44 user:        
    44 user:        
    45 date:        Thu Jan 01 00:00:00 1970 +0000
 
    45 date:        Thu Jan 01 00:00:00 1970 +0000
 
    46 
    46 
    47 
    47 
    48 % select files but no hunks
 
    48 % select files but no hunks
 
    49 diff --git a/empty-rw b/empty-rw
 
    49 diff --git a/empty-rw b/empty-rw
 
    50 new file mode 100644
 
    50 new file mode 100644
 
    51 record changes to 'empty-rw'? [Ynsfdaq?]  transaction abort!
 
    51 examine changes to 'empty-rw'? [Ynsfdaq?]  transaction abort!
 
    52 rollback completed
 
    52 rollback completed
 
    53 
    53 
    54 changeset:   -1:000000000000
 
    54 changeset:   -1:000000000000
 
    55 tag:         tip
 
    55 tag:         tip
 
    56 user:        
    56 user:        
    58 
    58 
    59 
    59 
    60 % record empty file
 
    60 % record empty file
 
    61 diff --git a/empty-rw b/empty-rw
 
    61 diff --git a/empty-rw b/empty-rw
 
    62 new file mode 100644
 
    62 new file mode 100644
 
    63 record changes to 'empty-rw'? [Ynsfdaq?]  
    63 examine changes to 'empty-rw'? [Ynsfdaq?]  
    64 changeset:   0:c0708cf4e46e
 
    64 changeset:   0:c0708cf4e46e
 
    65 tag:         tip
 
    65 tag:         tip
 
    66 user:        test
 
    66 user:        test
 
    67 date:        Thu Jan 01 00:00:00 1970 +0000
 
    67 date:        Thu Jan 01 00:00:00 1970 +0000
 
    68 summary:     empty
 
    68 summary:     empty
 
    70 
    70 
    71 % rename empty file
 
    71 % rename empty file
 
    72 diff --git a/empty-rw b/empty-rename
 
    72 diff --git a/empty-rw b/empty-rename
 
    73 rename from empty-rw
 
    73 rename from empty-rw
 
    74 rename to empty-rename
 
    74 rename to empty-rename
 
    75 record changes to 'empty-rw' and 'empty-rename'? [Ynsfdaq?]  
    75 examine changes to 'empty-rw' and 'empty-rename'? [Ynsfdaq?]  
    76 changeset:   1:df251d174da3
 
    76 changeset:   1:df251d174da3
 
    77 tag:         tip
 
    77 tag:         tip
 
    78 user:        test
 
    78 user:        test
 
    79 date:        Thu Jan 01 00:00:01 1970 +0000
 
    79 date:        Thu Jan 01 00:00:01 1970 +0000
 
    80 summary:     rename
 
    80 summary:     rename
 
    82 
    82 
    83 % copy empty file
 
    83 % copy empty file
 
    84 diff --git a/empty-rename b/empty-copy
 
    84 diff --git a/empty-rename b/empty-copy
 
    85 copy from empty-rename
 
    85 copy from empty-rename
 
    86 copy to empty-copy
 
    86 copy to empty-copy
 
    87 record changes to 'empty-rename' and 'empty-copy'? [Ynsfdaq?]  
    87 examine changes to 'empty-rename' and 'empty-copy'? [Ynsfdaq?]  
    88 changeset:   2:b63ea3939f8d
 
    88 changeset:   2:b63ea3939f8d
 
    89 tag:         tip
 
    89 tag:         tip
 
    90 user:        test
 
    90 user:        test
 
    91 date:        Thu Jan 01 00:00:02 1970 +0000
 
    91 date:        Thu Jan 01 00:00:02 1970 +0000
 
    92 summary:     copy
 
    92 summary:     copy
 
    93 
    93 
    94 
    94 
    95 % delete empty file
 
    95 % delete empty file
 
    96 diff --git a/empty-copy b/empty-copy
 
    96 diff --git a/empty-copy b/empty-copy
 
    97 deleted file mode 100644
 
    97 deleted file mode 100644
 
    98 record changes to 'empty-copy'? [Ynsfdaq?]  
    98 examine changes to 'empty-copy'? [Ynsfdaq?]  
    99 changeset:   3:a2546574bce9
 
    99 changeset:   3:a2546574bce9
 
   100 tag:         tip
 
   100 tag:         tip
 
   101 user:        test
 
   101 user:        test
 
   102 date:        Thu Jan 01 00:00:03 1970 +0000
 
   102 date:        Thu Jan 01 00:00:03 1970 +0000
 
   103 summary:     delete
 
   103 summary:     delete
 
   105 
   105 
   106 % add binary file
 
   106 % add binary file
 
   107 diff --git a/tip.bundle b/tip.bundle
 
   107 diff --git a/tip.bundle b/tip.bundle
 
   108 new file mode 100644
 
   108 new file mode 100644
 
   109 this is a binary file
 
   109 this is a binary file
 
   110 record changes to 'tip.bundle'? [Ynsfdaq?]  
   110 examine changes to 'tip.bundle'? [Ynsfdaq?]  
   111 changeset:   4:9e998a545a8b
 
   111 changeset:   4:9e998a545a8b
 
   112 tag:         tip
 
   112 tag:         tip
 
   113 user:        test
 
   113 user:        test
 
   114 date:        Thu Jan 01 00:00:04 1970 +0000
 
   114 date:        Thu Jan 01 00:00:04 1970 +0000
 
   115 summary:     binary
 
   115 summary:     binary
 
   118 Binary file tip.bundle has changed
 
   118 Binary file tip.bundle has changed
 
   119 
   119 
   120 % change binary file
 
   120 % change binary file
 
   121 diff --git a/tip.bundle b/tip.bundle
 
   121 diff --git a/tip.bundle b/tip.bundle
 
   122 this modifies a binary file (all or nothing)
 
   122 this modifies a binary file (all or nothing)
 
   123 record changes to 'tip.bundle'? [Ynsfdaq?]  
   123 examine changes to 'tip.bundle'? [Ynsfdaq?]  
   124 changeset:   5:93d05561507d
 
   124 changeset:   5:93d05561507d
 
   125 tag:         tip
 
   125 tag:         tip
 
   126 user:        test
 
   126 user:        test
 
   127 date:        Thu Jan 01 00:00:05 1970 +0000
 
   127 date:        Thu Jan 01 00:00:05 1970 +0000
 
   128 summary:     binary-change
 
   128 summary:     binary-change
 
   133 % rename and change binary file
 
   133 % rename and change binary file
 
   134 diff --git a/tip.bundle b/top.bundle
 
   134 diff --git a/tip.bundle b/top.bundle
 
   135 rename from tip.bundle
 
   135 rename from tip.bundle
 
   136 rename to top.bundle
 
   136 rename to top.bundle
 
   137 this modifies a binary file (all or nothing)
 
   137 this modifies a binary file (all or nothing)
 
   138 record changes to 'tip.bundle' and 'top.bundle'? [Ynsfdaq?]  
   138 examine changes to 'tip.bundle' and 'top.bundle'? [Ynsfdaq?]  
   139 changeset:   6:699cc1bea9aa
 
   139 changeset:   6:699cc1bea9aa
 
   140 tag:         tip
 
   140 tag:         tip
 
   141 user:        test
 
   141 user:        test
 
   142 date:        Thu Jan 01 00:00:06 1970 +0000
 
   142 date:        Thu Jan 01 00:00:06 1970 +0000
 
   143 summary:     binary-change-rename
 
   143 summary:     binary-change-rename
 
   148 Binary file top.bundle has changed
 
   148 Binary file top.bundle has changed
 
   149 
   149 
   150 % add plain file
 
   150 % add plain file
 
   151 diff --git a/plain b/plain
 
   151 diff --git a/plain b/plain
 
   152 new file mode 100644
 
   152 new file mode 100644
 
   153 record changes to 'plain'? [Ynsfdaq?]  
   153 examine changes to 'plain'? [Ynsfdaq?]  
   154 changeset:   7:118ed744216b
 
   154 changeset:   7:118ed744216b
 
   155 tag:         tip
 
   155 tag:         tip
 
   156 user:        test
 
   156 user:        test
 
   157 date:        Thu Jan 01 00:00:07 1970 +0000
 
   157 date:        Thu Jan 01 00:00:07 1970 +0000
 
   158 summary:     plain
 
   158 summary:     plain
 
   173 +10
 
   173 +10
 
   174 
   174 
   175 % modify end of plain file
 
   175 % modify end of plain file
 
   176 diff --git a/plain b/plain
 
   176 diff --git a/plain b/plain
 
   177 1 hunks, 1 lines changed
 
   177 1 hunks, 1 lines changed
 
   178 record changes to 'plain'? [Ynsfdaq?]  @@ -8,3 +8,4 @@ 8
 
   178 examine changes to 'plain'? [Ynsfdaq?]  @@ -8,3 +8,4 @@ 8
 
   179  8
 
   179  8
 
   180  9
 
   180  9
 
   181  10
 
   181  10
 
   182 +11
 
   182 +11
 
   183 record this change to 'plain'? [Ynsfdaq?]  % modify end of plain file, no EOL
 
   183 record this change to 'plain'? [Ynsfdaq?]  % modify end of plain file, no EOL
 
   184 diff --git a/plain b/plain
 
   184 diff --git a/plain b/plain
 
   185 1 hunks, 1 lines changed
 
   185 1 hunks, 1 lines changed
 
   186 record changes to 'plain'? [Ynsfdaq?]  @@ -9,3 +9,4 @@ 9
 
   186 examine changes to 'plain'? [Ynsfdaq?]  @@ -9,3 +9,4 @@ 9
 
   187  9
 
   187  9
 
   188  10
 
   188  10
 
   189  11
 
   189  11
 
   190 +cf81a2760718a74d44c0c2eecb72f659e63a69c5
 
   190 +cf81a2760718a74d44c0c2eecb72f659e63a69c5
 
   191 \ No newline at end of file
 
   191 \ No newline at end of file
 
   192 record this change to 'plain'? [Ynsfdaq?]  % modify end of plain file, add EOL
 
   192 record this change to 'plain'? [Ynsfdaq?]  % modify end of plain file, add EOL
 
   193 diff --git a/plain b/plain
 
   193 diff --git a/plain b/plain
 
   194 1 hunks, 2 lines changed
 
   194 1 hunks, 2 lines changed
 
   195 record changes to 'plain'? [Ynsfdaq?]  @@ -9,4 +9,4 @@ 9
 
   195 examine changes to 'plain'? [Ynsfdaq?]  @@ -9,4 +9,4 @@ 9
 
   196  9
 
   196  9
 
   197  10
 
   197  10
 
   198  11
 
   198  11
 
   199 -cf81a2760718a74d44c0c2eecb72f659e63a69c5
 
   199 -cf81a2760718a74d44c0c2eecb72f659e63a69c5
 
   200 \ No newline at end of file
 
   200 \ No newline at end of file
 
   201 +cf81a2760718a74d44c0c2eecb72f659e63a69c5
 
   201 +cf81a2760718a74d44c0c2eecb72f659e63a69c5
 
   202 record this change to 'plain'? [Ynsfdaq?]  % modify beginning, trim end, record both
 
   202 record this change to 'plain'? [Ynsfdaq?]  % modify beginning, trim end, record both
 
   203 diff --git a/plain b/plain
 
   203 diff --git a/plain b/plain
 
   204 2 hunks, 4 lines changed
 
   204 2 hunks, 4 lines changed
 
   205 record changes to 'plain'? [Ynsfdaq?]  @@ -1,4 +1,4 @@ 1
 
   205 examine changes to 'plain'? [Ynsfdaq?]  @@ -1,4 +1,4 @@ 1
 
   206 -1
 
   206 -1
 
   207 +2
 
   207 +2
 
   208  2
 
   208  2
 
   209  3
 
   209  3
 
   210  4
 
   210  4
 
   239 
   239 
   240 % trim beginning, modify end
 
   240 % trim beginning, modify end
 
   241 % record end
 
   241 % record end
 
   242 diff --git a/plain b/plain
 
   242 diff --git a/plain b/plain
 
   243 2 hunks, 5 lines changed
 
   243 2 hunks, 5 lines changed
 
   244 record changes to 'plain'? [Ynsfdaq?]  @@ -1,9 +1,6 @@ 2
 
   244 examine changes to 'plain'? [Ynsfdaq?]  @@ -1,9 +1,6 @@ 2
 
   245 -2
 
   245 -2
 
   246 -2
 
   246 -2
 
   247 -3
 
   247 -3
 
   248  4
 
   248  4
 
   249  5
 
   249  5
 
   278 +10.new
 
   278 +10.new
 
   279 
   279 
   280 % record beginning
 
   280 % record beginning
 
   281 diff --git a/plain b/plain
 
   281 diff --git a/plain b/plain
 
   282 1 hunks, 3 lines changed
 
   282 1 hunks, 3 lines changed
 
   283 record changes to 'plain'? [Ynsfdaq?]  @@ -1,6 +1,3 @@ 2
 
   283 examine changes to 'plain'? [Ynsfdaq?]  @@ -1,6 +1,3 @@ 2
 
   284 -2
 
   284 -2
 
   285 -2
 
   285 -2
 
   286 -3
 
   286 -3
 
   287  4
 
   287  4
 
   288  5
 
   288  5
 
   307 
   307 
   308 % add to beginning, trim from end
 
   308 % add to beginning, trim from end
 
   309 % record end
 
   309 % record end
 
   310 diff --git a/plain b/plain
 
   310 diff --git a/plain b/plain
 
   311 2 hunks, 4 lines changed
 
   311 2 hunks, 4 lines changed
 
   312 record changes to 'plain'? [Ynsfdaq?]  @@ -1,6 +1,9 @@ 4
 
   312 examine changes to 'plain'? [Ynsfdaq?]  @@ -1,6 +1,9 @@ 4
 
   313 +1
 
   313 +1
 
   314 +2
 
   314 +2
 
   315 +3
 
   315 +3
 
   316  4
 
   316  4
 
   317  5
 
   317  5
 
   329 -10.new
 
   329 -10.new
 
   330 record this change to 'plain'? [Ynsfdaq?]  % add to beginning, middle, end
 
   330 record this change to 'plain'? [Ynsfdaq?]  % add to beginning, middle, end
 
   331 % record beginning, middle
 
   331 % record beginning, middle
 
   332 diff --git a/plain b/plain
 
   332 diff --git a/plain b/plain
 
   333 3 hunks, 7 lines changed
 
   333 3 hunks, 7 lines changed
 
   334 record changes to 'plain'? [Ynsfdaq?]  @@ -1,2 +1,5 @@ 4
 
   334 examine changes to 'plain'? [Ynsfdaq?]  @@ -1,2 +1,5 @@ 4
 
   335 +1
 
   335 +1
 
   336 +2
 
   336 +2
 
   337 +3
 
   337 +3
 
   338  4
 
   338  4
 
   339  5
 
   339  5
 
   376  8
 
   376  8
 
   377 
   377 
   378 % record end
 
   378 % record end
 
   379 diff --git a/plain b/plain
 
   379 diff --git a/plain b/plain
 
   380 1 hunks, 2 lines changed
 
   380 1 hunks, 2 lines changed
 
   381 record changes to 'plain'? [Ynsfdaq?]  @@ -9,3 +9,5 @@ 7
 
   381 examine changes to 'plain'? [Ynsfdaq?]  @@ -9,3 +9,5 @@ 7
 
   382  7
 
   382  7
 
   383  8
 
   383  8
 
   384  9
 
   384  9
 
   385 +10
 
   385 +10
 
   386 +11
 
   386 +11
 
   402 +11
 
   402 +11
 
   403 
   403 
   404 adding subdir/a
 
   404 adding subdir/a
 
   405 diff --git a/subdir/a b/subdir/a
 
   405 diff --git a/subdir/a b/subdir/a
 
   406 1 hunks, 1 lines changed
 
   406 1 hunks, 1 lines changed
 
   407 record changes to 'subdir/a'? [Ynsfdaq?]  @@ -1,1 +1,2 @@ a
 
   407 examine changes to 'subdir/a'? [Ynsfdaq?]  @@ -1,1 +1,2 @@ a
 
   408  a
 
   408  a
 
   409 +a
 
   409 +a
 
   410 record this change to 'subdir/a'? [Ynsfdaq?]  
   410 record this change to 'subdir/a'? [Ynsfdaq?]  
   411 changeset:   18:33ff5c4fb017
 
   411 changeset:   18:33ff5c4fb017
 
   412 tag:         tip
 
   412 tag:         tip
 
   422 +a
 
   422 +a
 
   423 
   423 
   424 % help, quit
 
   424 % help, quit
 
   425 diff --git a/subdir/f1 b/subdir/f1
 
   425 diff --git a/subdir/f1 b/subdir/f1
 
   426 1 hunks, 1 lines changed
 
   426 1 hunks, 1 lines changed
 
   427 record changes to 'subdir/f1'? [Ynsfdaq?]  y - record this change
 
   427 examine changes to 'subdir/f1'? [Ynsfdaq?]  y - record this change
 
   428 n - skip this change
 
   428 n - skip this change
 
   429 s - skip remaining changes to this file
 
   429 s - skip remaining changes to this file
 
   430 f - record remaining changes to this file
 
   430 f - record remaining changes to this file
 
   431 d - done, skip remaining changes and files
 
   431 d - done, skip remaining changes and files
 
   432 a - record all changes to all remaining files
 
   432 a - record all changes to all remaining files
 
   433 q - quit, recording no changes
 
   433 q - quit, recording no changes
 
   434 ? - display help
 
   434 ? - display help
 
   435 record changes to 'subdir/f1'? [Ynsfdaq?]  abort: user quit
 
   435 examine changes to 'subdir/f1'? [Ynsfdaq?]  abort: user quit
 
   436 % skip
 
   436 % skip
 
   437 diff --git a/subdir/f1 b/subdir/f1
 
   437 diff --git a/subdir/f1 b/subdir/f1
 
   438 1 hunks, 1 lines changed
 
   438 1 hunks, 1 lines changed
 
   439 record changes to 'subdir/f1'? [Ynsfdaq?]  diff --git a/subdir/f2 b/subdir/f2
 
   439 examine changes to 'subdir/f1'? [Ynsfdaq?]  diff --git a/subdir/f2 b/subdir/f2
 
   440 1 hunks, 1 lines changed
 
   440 1 hunks, 1 lines changed
 
   441 record changes to 'subdir/f2'? [Ynsfdaq?]  abort: response expected
 
   441 examine changes to 'subdir/f2'? [Ynsfdaq?]  abort: response expected
 
   442 % no
 
   442 % no
 
   443 diff --git a/subdir/f1 b/subdir/f1
 
   443 diff --git a/subdir/f1 b/subdir/f1
 
   444 1 hunks, 1 lines changed
 
   444 1 hunks, 1 lines changed
 
   445 record changes to 'subdir/f1'? [Ynsfdaq?]  diff --git a/subdir/f2 b/subdir/f2
 
   445 examine changes to 'subdir/f1'? [Ynsfdaq?]  diff --git a/subdir/f2 b/subdir/f2
 
   446 1 hunks, 1 lines changed
 
   446 1 hunks, 1 lines changed
 
   447 record changes to 'subdir/f2'? [Ynsfdaq?]  abort: response expected
 
   447 examine changes to 'subdir/f2'? [Ynsfdaq?]  abort: response expected
 
   448 % f, quit
 
   448 % f, quit
 
   449 diff --git a/subdir/f1 b/subdir/f1
 
   449 diff --git a/subdir/f1 b/subdir/f1
 
   450 1 hunks, 1 lines changed
 
   450 1 hunks, 1 lines changed
 
   451 record changes to 'subdir/f1'? [Ynsfdaq?]  diff --git a/subdir/f2 b/subdir/f2
 
   451 examine changes to 'subdir/f1'? [Ynsfdaq?]  diff --git a/subdir/f2 b/subdir/f2
 
   452 1 hunks, 1 lines changed
 
   452 1 hunks, 1 lines changed
 
   453 record changes to 'subdir/f2'? [Ynsfdaq?]  abort: user quit
 
   453 examine changes to 'subdir/f2'? [Ynsfdaq?]  abort: user quit
 
   454 % s, all
 
   454 % s, all
 
   455 diff --git a/subdir/f1 b/subdir/f1
 
   455 diff --git a/subdir/f1 b/subdir/f1
 
   456 1 hunks, 1 lines changed
 
   456 1 hunks, 1 lines changed
 
   457 record changes to 'subdir/f1'? [Ynsfdaq?]  diff --git a/subdir/f2 b/subdir/f2
 
   457 examine changes to 'subdir/f1'? [Ynsfdaq?]  diff --git a/subdir/f2 b/subdir/f2
 
   458 1 hunks, 1 lines changed
 
   458 1 hunks, 1 lines changed
 
   459 record changes to 'subdir/f2'? [Ynsfdaq?]  
   459 examine changes to 'subdir/f2'? [Ynsfdaq?]  
   460 changeset:   20:094183e04b7c
 
   460 changeset:   20:094183e04b7c
 
   461 tag:         tip
 
   461 tag:         tip
 
   462 user:        test
 
   462 user:        test
 
   463 date:        Thu Jan 01 00:00:18 1970 +0000
 
   463 date:        Thu Jan 01 00:00:18 1970 +0000
 
   464 summary:     x
 
   464 summary:     x
 
   471 +b
 
   471 +b
 
   472 
   472 
   473 % f
 
   473 % f
 
   474 diff --git a/subdir/f1 b/subdir/f1
 
   474 diff --git a/subdir/f1 b/subdir/f1
 
   475 1 hunks, 1 lines changed
 
   475 1 hunks, 1 lines changed
 
   476 record changes to 'subdir/f1'? [Ynsfdaq?]  
   476 examine changes to 'subdir/f1'? [Ynsfdaq?]  
   477 changeset:   21:38164785b0ef
 
   477 changeset:   21:38164785b0ef
 
   478 tag:         tip
 
   478 tag:         tip
 
   479 user:        test
 
   479 user:        test
 
   480 date:        Thu Jan 01 00:00:19 1970 +0000
 
   480 date:        Thu Jan 01 00:00:19 1970 +0000
 
   481 summary:     y
 
   481 summary:     y
mercurial-crew-with-dirclash