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 5863 3d1f9dcecdea
parent 5763 e20de0caf8e7
child 6163 1f733c2f0165
equal deleted inserted replaced
5861:b860b116dea4 5863:3d1f9dcecdea 
   177 +10
 
   177 +10
 
   178 
   178 
   179 % modify end of plain file
 
   179 % modify end of plain file
 
   180 diff --git a/plain b/plain
 
   180 diff --git a/plain b/plain
 
   181 1 hunks, 1 lines changed
 
   181 1 hunks, 1 lines changed
 
   182 examine changes to 'plain'? [Ynsfdaq?]  @@ -8,3 +8,4 @@ 8
 
   182 examine changes to 'plain'? [Ynsfdaq?]  @@ -8,3 +8,4 @@
 
   183  8
 
   183  8
 
   184  9
 
   184  9
 
   185  10
 
   185  10
 
   186 +11
 
   186 +11
 
   187 record this change to 'plain'? [Ynsfdaq?]  % modify end of plain file, no EOL
 
   187 record this change to 'plain'? [Ynsfdaq?]  % modify end of plain file, no EOL
 
   188 diff --git a/plain b/plain
 
   188 diff --git a/plain b/plain
 
   189 1 hunks, 1 lines changed
 
   189 1 hunks, 1 lines changed
 
   190 examine changes to 'plain'? [Ynsfdaq?]  @@ -9,3 +9,4 @@ 9
 
   190 examine changes to 'plain'? [Ynsfdaq?]  @@ -9,3 +9,4 @@
 
   191  9
 
   191  9
 
   192  10
 
   192  10
 
   193  11
 
   193  11
 
   194 +cf81a2760718a74d44c0c2eecb72f659e63a69c5
 
   194 +cf81a2760718a74d44c0c2eecb72f659e63a69c5
 
   195 \ No newline at end of file
 
   195 \ No newline at end of file
 
   196 record this change to 'plain'? [Ynsfdaq?]  % modify end of plain file, add EOL
 
   196 record this change to 'plain'? [Ynsfdaq?]  % modify end of plain file, add EOL
 
   197 diff --git a/plain b/plain
 
   197 diff --git a/plain b/plain
 
   198 1 hunks, 2 lines changed
 
   198 1 hunks, 2 lines changed
 
   199 examine changes to 'plain'? [Ynsfdaq?]  @@ -9,4 +9,4 @@ 9
 
   199 examine changes to 'plain'? [Ynsfdaq?]  @@ -9,4 +9,4 @@
 
   200  9
 
   200  9
 
   201  10
 
   201  10
 
   202  11
 
   202  11
 
   203 -cf81a2760718a74d44c0c2eecb72f659e63a69c5
 
   203 -cf81a2760718a74d44c0c2eecb72f659e63a69c5
 
   204 \ No newline at end of file
 
   204 \ No newline at end of file
 
   205 +cf81a2760718a74d44c0c2eecb72f659e63a69c5
 
   205 +cf81a2760718a74d44c0c2eecb72f659e63a69c5
 
   206 record this change to 'plain'? [Ynsfdaq?]  % modify beginning, trim end, record both
 
   206 record this change to 'plain'? [Ynsfdaq?]  % modify beginning, trim end, record both
 
   207 diff --git a/plain b/plain
 
   207 diff --git a/plain b/plain
 
   208 2 hunks, 4 lines changed
 
   208 2 hunks, 4 lines changed
 
   209 examine changes to 'plain'? [Ynsfdaq?]  @@ -1,4 +1,4 @@ 1
 
   209 examine changes to 'plain'? [Ynsfdaq?]  @@ -1,4 +1,4 @@
 
   210 -1
 
   210 -1
 
   211 +2
 
   211 +2
 
   212  2
 
   212  2
 
   213  3
 
   213  3
 
   214  4
 
   214  4
 
   215 record this change to 'plain'? [Ynsfdaq?]  @@ -8,5 +8,3 @@ 8
 
   215 record this change to 'plain'? [Ynsfdaq?]  @@ -8,5 +8,3 @@
 
   216  8
 
   216  8
 
   217  9
 
   217  9
 
   218  10
 
   218  10
 
   219 -11
 
   219 -11
 
   220 -cf81a2760718a74d44c0c2eecb72f659e63a69c5
 
   220 -cf81a2760718a74d44c0c2eecb72f659e63a69c5
 
   226 summary:     begin-and-end
 
   226 summary:     begin-and-end
 
   227 
   227 
   228 diff -r e2ecd9b0b78d -r d09ab1967dab plain
 
   228 diff -r e2ecd9b0b78d -r d09ab1967dab plain
 
   229 --- a/plain	Thu Jan 01 00:00:10 1970 +0000
 
   229 --- a/plain	Thu Jan 01 00:00:10 1970 +0000
 
   230 +++ b/plain	Thu Jan 01 00:00:10 1970 +0000
 
   230 +++ b/plain	Thu Jan 01 00:00:10 1970 +0000
 
   231 @@ -1,4 +1,4 @@ 1
 
   231 @@ -1,4 +1,4 @@
 
   232 -1
 
   232 -1
 
   233 +2
 
   233 +2
 
   234  2
 
   234  2
 
   235  3
 
   235  3
 
   236  4
 
   236  4
 
   237 @@ -8,5 +8,3 @@ 8
 
   237 @@ -8,5 +8,3 @@
 
   238  8
 
   238  8
 
   239  9
 
   239  9
 
   240  10
 
   240  10
 
   241 -11
 
   241 -11
 
   242 -cf81a2760718a74d44c0c2eecb72f659e63a69c5
 
   242 -cf81a2760718a74d44c0c2eecb72f659e63a69c5
 
   243 
   243 
   244 % trim beginning, modify end
 
   244 % trim beginning, modify end
 
   245 % record end
 
   245 % record end
 
   246 diff --git a/plain b/plain
 
   246 diff --git a/plain b/plain
 
   247 2 hunks, 5 lines changed
 
   247 2 hunks, 5 lines changed
 
   248 examine changes to 'plain'? [Ynsfdaq?]  @@ -1,9 +1,6 @@ 2
 
   248 examine changes to 'plain'? [Ynsfdaq?]  @@ -1,9 +1,6 @@
 
   249 -2
 
   249 -2
 
   250 -2
 
   250 -2
 
   251 -3
 
   251 -3
 
   252  4
 
   252  4
 
   253  5
 
   253  5
 
   272 summary:     end-only
 
   272 summary:     end-only
 
   273 
   273 
   274 diff -r d09ab1967dab -r 44516c9708ae plain
 
   274 diff -r d09ab1967dab -r 44516c9708ae plain
 
   275 --- a/plain	Thu Jan 01 00:00:10 1970 +0000
 
   275 --- a/plain	Thu Jan 01 00:00:10 1970 +0000
 
   276 +++ b/plain	Thu Jan 01 00:00:11 1970 +0000
 
   276 +++ b/plain	Thu Jan 01 00:00:11 1970 +0000
 
   277 @@ -7,4 +7,4 @@ 7
 
   277 @@ -7,4 +7,4 @@
 
   278  7
 
   278  7
 
   279  8
 
   279  8
 
   280  9
 
   280  9
 
   281 -10
 
   281 -10
 
   282 +10.new
 
   282 +10.new
 
   283 
   283 
   284 % record beginning
 
   284 % record beginning
 
   285 diff --git a/plain b/plain
 
   285 diff --git a/plain b/plain
 
   286 1 hunks, 3 lines changed
 
   286 1 hunks, 3 lines changed
 
   287 examine changes to 'plain'? [Ynsfdaq?]  @@ -1,6 +1,3 @@ 2
 
   287 examine changes to 'plain'? [Ynsfdaq?]  @@ -1,6 +1,3 @@
 
   288 -2
 
   288 -2
 
   289 -2
 
   289 -2
 
   290 -3
 
   290 -3
 
   291  4
 
   291  4
 
   292  5
 
   292  5
 
   299 summary:     begin-only
 
   299 summary:     begin-only
 
   300 
   300 
   301 diff -r 44516c9708ae -r 3ebbace64a8d plain
 
   301 diff -r 44516c9708ae -r 3ebbace64a8d plain
 
   302 --- a/plain	Thu Jan 01 00:00:11 1970 +0000
 
   302 --- a/plain	Thu Jan 01 00:00:11 1970 +0000
 
   303 +++ b/plain	Thu Jan 01 00:00:12 1970 +0000
 
   303 +++ b/plain	Thu Jan 01 00:00:12 1970 +0000
 
   304 @@ -1,6 +1,3 @@ 2
 
   304 @@ -1,6 +1,3 @@
 
   305 -2
 
   305 -2
 
   306 -2
 
   306 -2
 
   307 -3
 
   307 -3
 
   308  4
 
   308  4
 
   309  5
 
   309  5
 
   311 
   311 
   312 % add to beginning, trim from end
 
   312 % add to beginning, trim from end
 
   313 % record end
 
   313 % record end
 
   314 diff --git a/plain b/plain
 
   314 diff --git a/plain b/plain
 
   315 2 hunks, 4 lines changed
 
   315 2 hunks, 4 lines changed
 
   316 examine changes to 'plain'? [Ynsfdaq?]  @@ -1,6 +1,9 @@ 4
 
   316 examine changes to 'plain'? [Ynsfdaq?]  @@ -1,6 +1,9 @@
 
   317 +1
 
   317 +1
 
   318 +2
 
   318 +2
 
   319 +3
 
   319 +3
 
   320  4
 
   320  4
 
   321  5
 
   321  5
 
   333 -10.new
 
   333 -10.new
 
   334 record this change to 'plain'? [Ynsfdaq?]  % add to beginning, middle, end
 
   334 record this change to 'plain'? [Ynsfdaq?]  % add to beginning, middle, end
 
   335 % record beginning, middle
 
   335 % record beginning, middle
 
   336 diff --git a/plain b/plain
 
   336 diff --git a/plain b/plain
 
   337 3 hunks, 7 lines changed
 
   337 3 hunks, 7 lines changed
 
   338 examine changes to 'plain'? [Ynsfdaq?]  @@ -1,2 +1,5 @@ 4
 
   338 examine changes to 'plain'? [Ynsfdaq?]  @@ -1,2 +1,5 @@
 
   339 +1
 
   339 +1
 
   340 +2
 
   340 +2
 
   341 +3
 
   341 +3
 
   342  4
 
   342  4
 
   343  5
 
   343  5
 
   365 summary:     middle-only
 
   365 summary:     middle-only
 
   366 
   366 
   367 diff -r efc0dad7bd9f -r c1c639d8b268 plain
 
   367 diff -r efc0dad7bd9f -r c1c639d8b268 plain
 
   368 --- a/plain	Thu Jan 01 00:00:13 1970 +0000
 
   368 --- a/plain	Thu Jan 01 00:00:13 1970 +0000
 
   369 +++ b/plain	Thu Jan 01 00:00:14 1970 +0000
 
   369 +++ b/plain	Thu Jan 01 00:00:14 1970 +0000
 
   370 @@ -1,5 +1,10 @@ 4
 
   370 @@ -1,5 +1,10 @@
 
   371 +1
 
   371 +1
 
   372 +2
 
   372 +2
 
   373 +3
 
   373 +3
 
   374  4
 
   374  4
 
   375  5
 
   375  5
 
   380  8
 
   380  8
 
   381 
   381 
   382 % record end
 
   382 % record end
 
   383 diff --git a/plain b/plain
 
   383 diff --git a/plain b/plain
 
   384 1 hunks, 2 lines changed
 
   384 1 hunks, 2 lines changed
 
   385 examine changes to 'plain'? [Ynsfdaq?]  @@ -9,3 +9,5 @@ 7
 
   385 examine changes to 'plain'? [Ynsfdaq?]  @@ -9,3 +9,5 @@
 
   386  7
 
   386  7
 
   387  8
 
   387  8
 
   388  9
 
   388  9
 
   389 +10
 
   389 +10
 
   390 +11
 
   390 +11
 
   396 summary:     end-only
 
   396 summary:     end-only
 
   397 
   397 
   398 diff -r c1c639d8b268 -r 80b74bbc7808 plain
 
   398 diff -r c1c639d8b268 -r 80b74bbc7808 plain
 
   399 --- a/plain	Thu Jan 01 00:00:14 1970 +0000
 
   399 --- a/plain	Thu Jan 01 00:00:14 1970 +0000
 
   400 +++ b/plain	Thu Jan 01 00:00:15 1970 +0000
 
   400 +++ b/plain	Thu Jan 01 00:00:15 1970 +0000
 
   401 @@ -9,3 +9,5 @@ 7
 
   401 @@ -9,3 +9,5 @@
 
   402  7
 
   402  7
 
   403  8
 
   403  8
 
   404  9
 
   404  9
 
   405 +10
 
   405 +10
 
   406 +11
 
   406 +11
 
   407 
   407 
   408 adding subdir/a
 
   408 adding subdir/a
 
   409 diff --git a/subdir/a b/subdir/a
 
   409 diff --git a/subdir/a b/subdir/a
 
   410 1 hunks, 1 lines changed
 
   410 1 hunks, 1 lines changed
 
   411 examine changes to 'subdir/a'? [Ynsfdaq?]  @@ -1,1 +1,2 @@ a
 
   411 examine changes to 'subdir/a'? [Ynsfdaq?]  @@ -1,1 +1,2 @@
 
   412  a
 
   412  a
 
   413 +a
 
   413 +a
 
   414 record this change to 'subdir/a'? [Ynsfdaq?]  
   414 record this change to 'subdir/a'? [Ynsfdaq?]  
   415 changeset:   18:33ff5c4fb017
 
   415 changeset:   18:33ff5c4fb017
 
   416 tag:         tip
 
   416 tag:         tip
 
   419 summary:     subdir-change
 
   419 summary:     subdir-change
 
   420 
   420 
   421 diff -r aecf2b2ea83c -r 33ff5c4fb017 subdir/a
 
   421 diff -r aecf2b2ea83c -r 33ff5c4fb017 subdir/a
 
   422 --- a/subdir/a	Thu Jan 01 00:00:16 1970 +0000
 
   422 --- a/subdir/a	Thu Jan 01 00:00:16 1970 +0000
 
   423 +++ b/subdir/a	Thu Jan 01 00:00:16 1970 +0000
 
   423 +++ b/subdir/a	Thu Jan 01 00:00:16 1970 +0000
 
   424 @@ -1,1 +1,2 @@ a
 
   424 @@ -1,1 +1,2 @@
 
   425  a
 
   425  a
 
   426 +a
 
   426 +a
 
   427 
   427 
   428 % help, quit
 
   428 % help, quit
 
   429 diff --git a/subdir/f1 b/subdir/f1
 
   429 diff --git a/subdir/f1 b/subdir/f1
 
   468 summary:     x
 
   468 summary:     x
 
   469 
   469 
   470 diff -r f9e855cd9374 -r 094183e04b7c subdir/f2
 
   470 diff -r f9e855cd9374 -r 094183e04b7c subdir/f2
 
   471 --- a/subdir/f2	Thu Jan 01 00:00:17 1970 +0000
 
   471 --- a/subdir/f2	Thu Jan 01 00:00:17 1970 +0000
 
   472 +++ b/subdir/f2	Thu Jan 01 00:00:18 1970 +0000
 
   472 +++ b/subdir/f2	Thu Jan 01 00:00:18 1970 +0000
 
   473 @@ -1,1 +1,2 @@ b
 
   473 @@ -1,1 +1,2 @@
 
   474  b
 
   474  b
 
   475 +b
 
   475 +b
 
   476 
   476 
   477 % f
 
   477 % f
 
   478 diff --git a/subdir/f1 b/subdir/f1
 
   478 diff --git a/subdir/f1 b/subdir/f1
 
   485 summary:     y
 
   485 summary:     y
 
   486 
   486 
   487 diff -r 094183e04b7c -r 38164785b0ef subdir/f1
 
   487 diff -r 094183e04b7c -r 38164785b0ef subdir/f1
 
   488 --- a/subdir/f1	Thu Jan 01 00:00:18 1970 +0000
 
   488 --- a/subdir/f1	Thu Jan 01 00:00:18 1970 +0000
 
   489 +++ b/subdir/f1	Thu Jan 01 00:00:19 1970 +0000
 
   489 +++ b/subdir/f1	Thu Jan 01 00:00:19 1970 +0000
 
   490 @@ -1,1 +1,2 @@ a
 
   490 @@ -1,1 +1,2 @@
 
   491  a
 
   491  a
 
   492 +a
 
   492 +a
 
   493 
   493
mercurial