Mercurial Mercurial > pub > hg > evolve / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-split.t
changeset 4293 d4902d48d095
parent 4292 caaa89adf3eb
child 4294 8974a05a49fa
equal deleted inserted replaced
4292:caaa89adf3eb 4293:d4902d48d095 
    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? [yNq?] N
 
    82   Done splitting? [yNdq?] 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? [yNq?] y
 
   204   Done splitting? [yNdq?] 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? [yNq?] y
 
   305   Done splitting? [yNdq?] 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? [yNq?] Y
 
   457   Done splitting? [yNdq?] 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? [yNq?] N
 
   554   Done splitting? [yNdq?] 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
 
   685   a - record all changes to all remaining files
 
   685   a - record all changes to all remaining files
 
   686   q - quit, recording no changes
 
   686   q - quit, recording no changes
 
   687   ? - ? (display help)
 
   687   ? - ? (display help)
 
   688   examine changes to 'SPLIT4'? [Ynesfdaq?] d
 
   688   examine changes to 'SPLIT4'? [Ynesfdaq?] d
 
   689   
   689   
   690   Done splitting? [yNq?] ?
 
   690   Done splitting? [yNdq?] ?
 
   691   y - yes, commit all remaining changes
 
   691   y - yes, commit all remaining changes
 
   692   n - no, continue selection
 
   692   n - no, continue selection
 
       
   693   d - discard, discard remaining changes
 
   693   q - quit, abort the split
 
   694   q - quit, abort the split
 
   694   ? - ?, display help
 
   695   ? - ?, display help
 
   695   Done splitting? [yNq?] q
 
   696   Done splitting? [yNdq?] q
 
   696   transaction abort!
 
   697   transaction abort!
 
   697   rollback completed
 
   698   rollback completed
 
   698   abort: user quit
 
   699   abort: user quit
 
   699   [255]
 
   700   [255]
 
       
   701 
       
   702 discard some of changeset during split
 
       
   703 
       
   704   $ cat >> $HGRCPATH <<EOF
 
       
   705   > [experimental]
 
       
   706   > evolution=all
 
       
   707   > evolutioncommands=
 
       
   708   > EOF
 
       
   709 
       
   710   $ hg export
 
       
   711   # HG changeset patch
 
       
   712   # User test
 
       
   713   # Date 0 0
 
       
   714   #      Thu Jan 01 00:00:00 1970 +0000
 
       
   715   # Branch another-branch
 
       
   716   # Node ID 56a59faa8af70dc104faa905231731ffece5f18a
 
       
   717   # Parent  75695e3e2300d316cc515c4c25bab8b825ef1433
 
       
   718   # EXP-Topic mytopic
 
       
   719   split10
 
       
   720   
       
   721   diff --git a/SPLIT2 b/SPLIT2
 
       
   722   new file mode 100644
 
       
   723   $ hg add SPLIT3
 
       
   724   $ hg amend
 
       
   725   1 new orphan changesets
 
       
   726   $ hg export
 
       
   727   # HG changeset patch
 
       
   728   # User test
 
       
   729   # Date 0 0
 
       
   730   #      Thu Jan 01 00:00:00 1970 +0000
 
       
   731   # Branch another-branch
 
       
   732   # Node ID 3acb634dc68ddb4dea75a9cee982955bc1f3e8cd
 
       
   733   # Parent  75695e3e2300d316cc515c4c25bab8b825ef1433
 
       
   734   # EXP-Topic mytopic
 
       
   735   split10
 
       
   736   
       
   737   diff --git a/SPLIT2 b/SPLIT2
 
       
   738   new file mode 100644
 
       
   739   diff --git a/SPLIT3 b/SPLIT3
 
       
   740   new file mode 100644
 
       
   741   $ hg split << EOF
 
       
   742   > Y
 
       
   743   > d
 
       
   744   > d
 
       
   745   > EOF
 
       
   746   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
 
       
   747   adding SPLIT2
 
       
   748   adding SPLIT3
 
       
   749   diff --git a/SPLIT2 b/SPLIT2
 
       
   750   new file mode 100644
 
       
   751   examine changes to 'SPLIT2'? [Ynesfdaq?] Y
 
       
   752   
       
   753   diff --git a/SPLIT3 b/SPLIT3
 
       
   754   new file mode 100644
 
       
   755   examine changes to 'SPLIT3'? [Ynesfdaq?] d
 
       
   756   
       
   757   Done splitting? [yNdq?] d
 
       
   758   discarding remaining changes
 
       
   759   forgetting SPLIT3
 
       
   760   $ hg export
 
       
   761   # HG changeset patch
 
       
   762   # User test
 
       
   763   # Date 0 0
 
       
   764   #      Thu Jan 01 00:00:00 1970 +0000
 
       
   765   # Branch another-branch
 
       
   766   # Node ID db690d5566962489d65945c90b468b44e0b1507a
 
       
   767   # Parent  75695e3e2300d316cc515c4c25bab8b825ef1433
 
       
   768   # EXP-Topic mytopic
 
       
   769   split12
 
       
   770   
       
   771   diff --git a/SPLIT2 b/SPLIT2
 
       
   772   new file mode 100644
 
       
   773   $ hg status
 
       
   774   ? SPLIT3
 
       
   775   ? SPLIT4
 
       
   776   ? editor.sh
 
       
   777   ? num
evolve