tests/test-mv-cp-st-diff.t
changeset 15775 91eb4512edd0
parent 15447 9910f60a37ee
child 17345 4f8054d3171b
equal deleted inserted replaced
15774:0bd17a4bed88 15775:91eb4512edd0
   558   +3
   558   +3
   559   +b1
   559   +b1
   560   
   560   
   561   - parent to root: --rev . --rev 0
   561   - parent to root: --rev . --rev 0
   562   M a
   562   M a
       
   563     b
   563   R b
   564   R b
   564   
   565   
   565   diff --git a/a b/a
   566   diff --git a/a b/a
   566   --- a/a
   567   --- a/a
   567   +++ b/a
   568   +++ b/a
   609   @@ -1,1 +0,0 @@
   610   @@ -1,1 +0,0 @@
   610   -y1
   611   -y1
   611   
   612   
   612   - parent to branch: --rev . --rev 2
   613   - parent to branch: --rev . --rev 2
   613   M a
   614   M a
       
   615     b
   614   A x/y
   616   A x/y
   615   R b
   617   R b
   616   
   618   
   617   diff --git a/a b/a
   619   diff --git a/a b/a
   618   --- a/a
   620   --- a/a
   904    a
   906    a
   905   +5
   907   +5
   906   
   908   
   907   - parent to root: --rev . --rev 0
   909   - parent to root: --rev . --rev 0
   908   M a
   910   M a
       
   911     b
   909   R b
   912   R b
   910   R c
   913   R c
   911   
   914   
   912   diff --git a/a b/a
   915   diff --git a/a b/a
   913   --- a/a
   916   --- a/a
   973   @@ -1,1 +0,0 @@
   976   @@ -1,1 +0,0 @@
   974   -y1
   977   -y1
   975   
   978   
   976   - parent to branch: --rev . --rev 2
   979   - parent to branch: --rev . --rev 2
   977   M a
   980   M a
       
   981     b
   978   A x/y
   982   A x/y
   979   R b
   983   R b
   980   R c
   984   R c
   981   
   985   
   982   diff --git a/a b/a
   986   diff --git a/a b/a