tests/test-split.t
changeset 4291 8f54ab5dd4e2
parent 4122 4eb3877540f1
child 4292 caaa89adf3eb
equal deleted inserted replaced
4288:00bc03f56f37 4291:8f54ab5dd4e2
    77   @@ -0,0 +1,1 @@
    77   @@ -0,0 +1,1 @@
    78   +_d
    78   +_d
    79   record change 2/2 to '_d'? [Ynesfdaq?] n
    79   record change 2/2 to '_d'? [Ynesfdaq?] n
    80   
    80   
    81   created new head
    81   created new head
    82   Done splitting? [yN] N
    82   Done splitting? [yN?] N
    83   diff --git a/_d b/_d
    83   diff --git a/_d b/_d
    84   new file mode 100644
    84   new file mode 100644
    85   examine changes to '_d'? [Ynesfdaq?] y
    85   examine changes to '_d'? [Ynesfdaq?] y
    86   
    86   
    87   @@ -0,0 +1,1 @@
    87   @@ -0,0 +1,1 @@
   199   @@ -0,0 +1,1 @@
   199   @@ -0,0 +1,1 @@
   200   +_c
   200   +_c
   201   record change 2/2 to '_c'? [Ynesfdaq?] n
   201   record change 2/2 to '_c'? [Ynesfdaq?] n
   202   
   202   
   203   created new head
   203   created new head
   204   Done splitting? [yN] y
   204   Done splitting? [yN?] y
   205   2 new orphan changesets
   205   2 new orphan changesets
   206 
   206 
   207 Stop before splitting the commit completely creates a commit with all the
   207 Stop before splitting the commit completely creates a commit with all the
   208 remaining changes
   208 remaining changes
   209 
   209 
   300   diff --git a/_d b/_d
   300   diff --git a/_d b/_d
   301   new file mode 100644
   301   new file mode 100644
   302   examine changes to '_d'? [Ynesfdaq?] n
   302   examine changes to '_d'? [Ynesfdaq?] n
   303   
   303   
   304   created new head
   304   created new head
   305   Done splitting? [yN] y
   305   Done splitting? [yN?] y
   306   $ hg log -G -r "3f134f739075::"
   306   $ hg log -G -r "3f134f739075::"
   307   @  changeset:   16:452a26648478
   307   @  changeset:   16:452a26648478
   308   |  bookmark:    bookA
   308   |  bookmark:    bookA
   309   |  bookmark:    bookB
   309   |  bookmark:    bookB
   310   |  tag:         tip
   310   |  tag:         tip
   452   
   452   
   453   diff --git a/celeste b/celeste
   453   diff --git a/celeste b/celeste
   454   new file mode 100644
   454   new file mode 100644
   455   examine changes to 'celeste'? [Ynesfdaq?] N
   455   examine changes to 'celeste'? [Ynesfdaq?] N
   456   
   456   
   457   Done splitting? [yN] Y
   457   Done splitting? [yN?] Y
   458   diff --git a/celeste b/celeste
   458   diff --git a/celeste b/celeste
   459   new file mode 100644
   459   new file mode 100644
   460   examine changes to 'celeste'? [Ynesfdaq?] Y
   460   examine changes to 'celeste'? [Ynesfdaq?] Y
   461   
   461   
   462   @@ -0,0 +1,1 @@
   462   @@ -0,0 +1,1 @@
   549   
   549   
   550   diff --git a/SPLIT2 b/SPLIT2
   550   diff --git a/SPLIT2 b/SPLIT2
   551   new file mode 100644
   551   new file mode 100644
   552   examine changes to 'SPLIT2'? [Ynesfdaq?] N
   552   examine changes to 'SPLIT2'? [Ynesfdaq?] N
   553   
   553   
   554   Done splitting? [yN] N
   554   Done splitting? [yN?] N
   555   diff --git a/SPLIT2 b/SPLIT2
   555   diff --git a/SPLIT2 b/SPLIT2
   556   new file mode 100644
   556   new file mode 100644
   557   examine changes to 'SPLIT2'? [Ynesfdaq?] Y
   557   examine changes to 'SPLIT2'? [Ynesfdaq?] Y
   558   
   558   
   559   no more change to split
   559   no more change to split
   649   ~  topic:       mytopic
   649   ~  topic:       mytopic
   650      user:        test
   650      user:        test
   651      date:        Thu Jan 01 00:00:00 1970 +0000
   651      date:        Thu Jan 01 00:00:00 1970 +0000
   652      summary:     split10
   652      summary:     split10
   653   
   653   
       
   654 
       
   655 
       
   656 Check prompt options
       
   657 --------------------
       
   658 
       
   659 Look at the help (both record and split helps)
       
   660 
       
   661   $ hg split -r tip << EOF
       
   662   > Y
       
   663   > ?
       
   664   > d
       
   665   > ?
       
   666   > N
       
   667   > q
       
   668   > EOF
       
   669   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
   670   adding SPLIT3
       
   671   adding SPLIT4
       
   672   diff --git a/SPLIT3 b/SPLIT3
       
   673   new file mode 100644
       
   674   examine changes to 'SPLIT3'? [Ynesfdaq?] Y
       
   675   
       
   676   diff --git a/SPLIT4 b/SPLIT4
       
   677   new file mode 100644
       
   678   examine changes to 'SPLIT4'? [Ynesfdaq?] ?
       
   679   
       
   680   y - yes, record this change
       
   681   n - no, skip this change
       
   682   e - edit this change manually
       
   683   s - skip remaining changes to this file
       
   684   f - record remaining changes to this file
       
   685   d - done, skip remaining changes and files
       
   686   a - record all changes to all remaining files
       
   687   q - quit, recording no changes
       
   688   ? - ? (display help)
       
   689   examine changes to 'SPLIT4'? [Ynesfdaq?] d
       
   690   
       
   691   Done splitting? [yN?] ?
       
   692   y - yes, commit all remaining changes
       
   693   n - no, continue selection
       
   694   ? - ?, display help
       
   695   Done splitting? [yN?] N
       
   696   diff --git a/SPLIT4 b/SPLIT4
       
   697   new file mode 100644
       
   698   examine changes to 'SPLIT4'? [Ynesfdaq?] q
       
   699   
       
   700   transaction abort!
       
   701   rollback completed
       
   702   abort: user quit
       
   703   [255]