tests/test-split.t
branchmercurial-4.4
changeset 4675 79bc0f1a832e
parent 4671 63a816beee7e
parent 4552 0eb80259f9cb
equal deleted inserted replaced
4674:3810ca63398f 4675:79bc0f1a832e
   148   $ hg phase --rev 'desc("_a")' --draft --force
   148   $ hg phase --rev 'desc("_a")' --draft --force
   149 
   149 
   150 Split a revision specified with -r
   150 Split a revision specified with -r
   151   $ echo "change to b" >> _b
   151   $ echo "change to b" >> _b
   152   $ hg amend -m "_cprim"
   152   $ hg amend -m "_cprim"
   153   2 new orphan changesets
       
   154   $ hg evolve --all --update
   153   $ hg evolve --all --update
   155   move:[5] split1
   154   move:[5] split1
   156   atop:[7] _cprim
   155   atop:[7] _cprim
   157   move:[6] split2
   156   move:[6] split2
   158   working directory is now at * (glob)
   157   working directory is now at * (glob)
   204   +_c
   203   +_c
   205   record change 2/2 to '_c'? [Ynesfdaq?] n
   204   record change 2/2 to '_c'? [Ynesfdaq?] n
   206   
   205   
   207   created new head
   206   created new head
   208   continue splitting? [Ycdq?] c
   207   continue splitting? [Ycdq?] c
   209   2 new orphan changesets
       
   210 
   208 
   211 Stop before splitting the commit completely creates a commit with all the
   209 Stop before splitting the commit completely creates a commit with all the
   212 remaining changes
   210 remaining changes
   213 
   211 
   214   $ hg debugobsolete
   212   $ hg debugobsolete
   713   
   711   
   714   diff --git a/SPLIT2 b/SPLIT2
   712   diff --git a/SPLIT2 b/SPLIT2
   715   new file mode 100644
   713   new file mode 100644
   716   $ hg add SPLIT3
   714   $ hg add SPLIT3
   717   $ hg amend
   715   $ hg amend
   718   1 new orphan changesets
       
   719   $ hg export
   716   $ hg export
   720   # HG changeset patch
   717   # HG changeset patch
   721   # User test
   718   # User test
   722   # Date 0 0
   719   # Date 0 0
   723   #      Thu Jan 01 00:00:00 1970 +0000
   720   #      Thu Jan 01 00:00:00 1970 +0000
  1049   @@ -0,0 +1,1 @@
  1046   @@ -0,0 +1,1 @@
  1050   +b
  1047   +b
  1051   record this change to 'b'? [Ynesfdaq?] y
  1048   record this change to 'b'? [Ynesfdaq?] y
  1052   
  1049   
  1053   no more change to split
  1050   no more change to split
  1054   1 new orphan changesets
       
  1055 
  1051 
  1056   $ hg glog -p
  1052   $ hg glog -p
  1057   @  4:5cf253fa63fa split2 (draft)
  1053   @  4:5cf253fa63fa split2 (draft)
  1058   |  diff --git a/b b/b
  1054   |  diff --git a/b b/b
  1059   |  new file mode 100644
  1055   |  new file mode 100644
  1068   |  --- /dev/null
  1064   |  --- /dev/null
  1069   |  +++ b/a
  1065   |  +++ b/a
  1070   |  @@ -0,0 +1,1 @@
  1066   |  @@ -0,0 +1,1 @@
  1071   |  +a
  1067   |  +a
  1072   |
  1068   |
  1073   | *  2:ab6ca3ebca74 c (draft)
  1069   | o  2:ab6ca3ebca74 c (draft)
  1074   | |  diff --git a/c b/c
  1070   | |  diff --git a/c b/c
  1075   | |  new file mode 100644
  1071   | |  new file mode 100644
  1076   | |  --- /dev/null
  1072   | |  --- /dev/null
  1077   | |  +++ b/c
  1073   | |  +++ b/c
  1078   | |  @@ -0,0 +1,1 @@
  1074   | |  @@ -0,0 +1,1 @@