tests/test-qrecord.t
changeset 42566 f802a75da585
parent 42052 15d2afa31e57
child 45845 21733e8c924f
equal deleted inserted replaced
42565:4764e8436b2a 42566:f802a75da585
   258   > y
   258   > y
   259   > n
   259   > n
   260   > EOF
   260   > EOF
   261   diff --git a/1.txt b/1.txt
   261   diff --git a/1.txt b/1.txt
   262   2 hunks, 2 lines changed
   262   2 hunks, 2 lines changed
   263   examine changes to '1.txt'? [Ynesfdaq?] y
   263   examine changes to '1.txt'?
       
   264   (enter ? for help) [Ynesfdaq?] y
   264   
   265   
   265   @@ -1,3 +1,3 @@
   266   @@ -1,3 +1,3 @@
   266    1
   267    1
   267   -2
   268   -2
   268   +2 2
   269   +2 2
   269    3
   270    3
   270   record change 1/4 to '1.txt'? [Ynesfdaq?] y
   271   record change 1/4 to '1.txt'?
       
   272   (enter ? for help) [Ynesfdaq?] y
   271   
   273   
   272   @@ -3,3 +3,3 @@
   274   @@ -3,3 +3,3 @@
   273    3
   275    3
   274   -4
   276   -4
   275   +4 4
   277   +4 4
   276    5
   278    5
   277   record change 2/4 to '1.txt'? [Ynesfdaq?] n
   279   record change 2/4 to '1.txt'?
       
   280   (enter ? for help) [Ynesfdaq?] n
   278   
   281   
   279   diff --git a/2.txt b/2.txt
   282   diff --git a/2.txt b/2.txt
   280   1 hunks, 1 lines changed
   283   1 hunks, 1 lines changed
   281   examine changes to '2.txt'? [Ynesfdaq?] y
   284   examine changes to '2.txt'?
       
   285   (enter ? for help) [Ynesfdaq?] y
   282   
   286   
   283   @@ -1,5 +1,5 @@
   287   @@ -1,5 +1,5 @@
   284    a
   288    a
   285   -b
   289   -b
   286   +b b
   290   +b b
   287    c
   291    c
   288    d
   292    d
   289    e
   293    e
   290   record change 3/4 to '2.txt'? [Ynesfdaq?] y
   294   record change 3/4 to '2.txt'?
       
   295   (enter ? for help) [Ynesfdaq?] y
   291   
   296   
   292   diff --git a/dir/a.txt b/dir/a.txt
   297   diff --git a/dir/a.txt b/dir/a.txt
   293   1 hunks, 1 lines changed
   298   1 hunks, 1 lines changed
   294   examine changes to 'dir/a.txt'? [Ynesfdaq?] n
   299   examine changes to 'dir/a.txt'?
       
   300   (enter ? for help) [Ynesfdaq?] n
   295   
   301   
   296 
   302 
   297 After qrecord a.patch 'tip'"
   303 After qrecord a.patch 'tip'"
   298 
   304 
   299   $ hg tip -p
   305   $ hg tip -p
   359   > y
   365   > y
   360   > y
   366   > y
   361   > EOF
   367   > EOF
   362   diff --git a/1.txt b/1.txt
   368   diff --git a/1.txt b/1.txt
   363   1 hunks, 1 lines changed
   369   1 hunks, 1 lines changed
   364   examine changes to '1.txt'? [Ynesfdaq?] y
   370   examine changes to '1.txt'?
       
   371   (enter ? for help) [Ynesfdaq?] y
   365   
   372   
   366   @@ -1,5 +1,5 @@
   373   @@ -1,5 +1,5 @@
   367    1
   374    1
   368    2 2
   375    2 2
   369    3
   376    3
   370   -4
   377   -4
   371   +4 4
   378   +4 4
   372    5
   379    5
   373   record change 1/2 to '1.txt'? [Ynesfdaq?] y
   380   record change 1/2 to '1.txt'?
       
   381   (enter ? for help) [Ynesfdaq?] y
   374   
   382   
   375   diff --git a/dir/a.txt b/dir/a.txt
   383   diff --git a/dir/a.txt b/dir/a.txt
   376   1 hunks, 1 lines changed
   384   1 hunks, 1 lines changed
   377   examine changes to 'dir/a.txt'? [Ynesfdaq?] y
   385   examine changes to 'dir/a.txt'?
       
   386   (enter ? for help) [Ynesfdaq?] y
   378   
   387   
   379   @@ -1,4 +1,4 @@
   388   @@ -1,4 +1,4 @@
   380   -hello world
   389   -hello world
   381   +hello world!
   390   +hello world!
   382    
   391    
   383    someone
   392    someone
   384    up
   393    up
   385   record change 2/2 to 'dir/a.txt'? [Ynesfdaq?] y
   394   record change 2/2 to 'dir/a.txt'?
       
   395   (enter ? for help) [Ynesfdaq?] y
   386   
   396   
   387 
   397 
   388 After qrecord b.patch 'tip'
   398 After qrecord b.patch 'tip'
   389 
   399 
   390   $ hg tip -p
   400   $ hg tip -p