tests/test-evolve-obshistory-complex.t
changeset 4294 8974a05a49fa
parent 4293 d4902d48d095
child 4298 a98fa6c0d4f3
equal deleted inserted replaced
4293:d4902d48d095 4294:8974a05a49fa
   142 
   142 
   143   $ hg split "desc(fold0)" -d "0 0" << EOF
   143   $ hg split "desc(fold0)" -d "0 0" << EOF
   144   > Y
   144   > Y
   145   > Y
   145   > Y
   146   > N
   146   > N
   147   > N
   147   > Y
   148   > Y
   148   > Y
   149   > Y
   149   > Y
   150   > EOF
   150   > EOF
   151   0 files updated, 0 files merged, 6 files removed, 0 files unresolved
   151   0 files updated, 0 files merged, 6 files removed, 0 files unresolved
   152   adding A
   152   adding A
   162   diff --git a/B b/B
   162   diff --git a/B b/B
   163   new file mode 100644
   163   new file mode 100644
   164   examine changes to 'B'? [Ynesfdaq?] N
   164   examine changes to 'B'? [Ynesfdaq?] N
   165   
   165   
   166   created new head
   166   created new head
   167   Done splitting? [yNdq?] N
   167   continue splitting? [Ycdq?] Y
   168   diff --git a/B b/B
   168   diff --git a/B b/B
   169   new file mode 100644
   169   new file mode 100644
   170   examine changes to 'B'? [Ynesfdaq?] Y
   170   examine changes to 'B'? [Ynesfdaq?] Y
   171   
   171   
   172   @@ -0,0 +1,1 @@
   172   @@ -0,0 +1,1 @@
   176   no more change to split
   176   no more change to split
   177   $ hg split "desc(fold1)" -d "0 0" << EOF
   177   $ hg split "desc(fold1)" -d "0 0" << EOF
   178   > Y
   178   > Y
   179   > Y
   179   > Y
   180   > N
   180   > N
   181   > N
   181   > Y
   182   > Y
   182   > Y
   183   > Y
   183   > Y
   184   > EOF
   184   > EOF
   185   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   185   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   186   adding C
   186   adding C
   196   diff --git a/D b/D
   196   diff --git a/D b/D
   197   new file mode 100644
   197   new file mode 100644
   198   examine changes to 'D'? [Ynesfdaq?] N
   198   examine changes to 'D'? [Ynesfdaq?] N
   199   
   199   
   200   created new head
   200   created new head
   201   Done splitting? [yNdq?] N
   201   continue splitting? [Ycdq?] Y
   202   diff --git a/D b/D
   202   diff --git a/D b/D
   203   new file mode 100644
   203   new file mode 100644
   204   examine changes to 'D'? [Ynesfdaq?] Y
   204   examine changes to 'D'? [Ynesfdaq?] Y
   205   
   205   
   206   @@ -0,0 +1,1 @@
   206   @@ -0,0 +1,1 @@
   211   1 new orphan changesets
   211   1 new orphan changesets
   212   $ hg split "desc(fold2)" -d "0 0" << EOF
   212   $ hg split "desc(fold2)" -d "0 0" << EOF
   213   > Y
   213   > Y
   214   > Y
   214   > Y
   215   > N
   215   > N
   216   > N
   216   > Y
   217   > Y
   217   > Y
   218   > Y
   218   > Y
   219   > EOF
   219   > EOF
   220   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   220   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   221   adding E
   221   adding E
   231   diff --git a/F b/F
   231   diff --git a/F b/F
   232   new file mode 100644
   232   new file mode 100644
   233   examine changes to 'F'? [Ynesfdaq?] N
   233   examine changes to 'F'? [Ynesfdaq?] N
   234   
   234   
   235   created new head
   235   created new head
   236   Done splitting? [yNdq?] N
   236   continue splitting? [Ycdq?] Y
   237   diff --git a/F b/F
   237   diff --git a/F b/F
   238   new file mode 100644
   238   new file mode 100644
   239   examine changes to 'F'? [Ynesfdaq?] Y
   239   examine changes to 'F'? [Ynesfdaq?] Y
   240   
   240   
   241   @@ -0,0 +1,1 @@
   241   @@ -0,0 +1,1 @@