tests/test-evolve-orphan-split.t
branchmercurial-5.0
changeset 4863 5cd7d16b8733
parent 4777 ff452675566c
child 5280 90fbbc29b93a
equal deleted inserted replaced
4862:40795751be1c 4863:5cd7d16b8733
    46   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
    46   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
    47   adding a
    47   adding a
    48   adding b
    48   adding b
    49   diff --git a/a b/a
    49   diff --git a/a b/a
    50   new file mode 100644
    50   new file mode 100644
    51   examine changes to 'a'?
    51   examine changes to 'a'? [Ynesfdaq?] y
    52   (enter ? for help) [Ynesfdaq?] y
    52   
    53   
    53   @@ -0,0 +1,1 @@
    54   @@ -0,0 +1,1 @@
    54   +foo
    55   +foo
    55   record change 1/2 to 'a'? [Ynesfdaq?] y
    56   record change 1/2 to 'a'?
       
    57   (enter ? for help) [Ynesfdaq?] y
       
    58   
    56   
    59   diff --git a/b b/b
    57   diff --git a/b b/b
    60   new file mode 100644
    58   new file mode 100644
    61   examine changes to 'b'?
    59   examine changes to 'b'? [Ynesfdaq?] n
    62   (enter ? for help) [Ynesfdaq?] n
       
    63   
    60   
    64   created new head
    61   created new head
    65   continue splitting? [Ycdq?] c
    62   continue splitting? [Ycdq?] c
    66   1 new orphan changesets
    63   1 new orphan changesets
    67 
    64 
   130   adding a
   127   adding a
   131   adding b
   128   adding b
   132   adding c
   129   adding c
   133   diff --git a/a b/a
   130   diff --git a/a b/a
   134   new file mode 100644
   131   new file mode 100644
   135   examine changes to 'a'?
   132   examine changes to 'a'? [Ynesfdaq?] y
   136   (enter ? for help) [Ynesfdaq?] y
   133   
   137   
   134   @@ -0,0 +1,1 @@
   138   @@ -0,0 +1,1 @@
   135   +foo
   139   +foo
   136   record change 1/3 to 'a'? [Ynesfdaq?] n
   140   record change 1/3 to 'a'?
       
   141   (enter ? for help) [Ynesfdaq?] n
       
   142   
   137   
   143   diff --git a/b b/b
   138   diff --git a/b b/b
   144   new file mode 100644
   139   new file mode 100644
   145   examine changes to 'b'?
   140   examine changes to 'b'? [Ynesfdaq?] y
   146   (enter ? for help) [Ynesfdaq?] y
   141   
   147   
   142   @@ -0,0 +1,1 @@
   148   @@ -0,0 +1,1 @@
   143   +foo
   149   +foo
   144   record change 2/3 to 'b'? [Ynesfdaq?] y
   150   record change 2/3 to 'b'?
       
   151   (enter ? for help) [Ynesfdaq?] y
       
   152   
   145   
   153   diff --git a/c b/c
   146   diff --git a/c b/c
   154   new file mode 100644
   147   new file mode 100644
   155   examine changes to 'c'?
   148   examine changes to 'c'? [Ynesfdaq?] y
   156   (enter ? for help) [Ynesfdaq?] y
   149   
   157   
   150   @@ -0,0 +1,1 @@
   158   @@ -0,0 +1,1 @@
   151   +foo
   159   +foo
   152   record change 3/3 to 'c'? [Ynesfdaq?] y
   160   record change 3/3 to 'c'?
       
   161   (enter ? for help) [Ynesfdaq?] y
       
   162   
   153   
   163   created new head
   154   created new head
   164   continue splitting? [Ycdq?] c
   155   continue splitting? [Ycdq?] c
   165   1 new orphan changesets
   156   1 new orphan changesets
   166 
   157