tests/test-split.t
changeset 4411 8ff5e557432a
parent 4392 c09889f81947
parent 4410 8087e9a0f902
child 4455 b58e45aa9be2
equal deleted inserted replaced
4408:02ece0e5865e 4411:8ff5e557432a
  1116   |
  1116   |
  1117   o  3:88437e073cd4 split1 (draft)
  1117   o  3:88437e073cd4 split1 (draft)
  1118   |
  1118   |
  1119   o  0:a5a1faba8d26 p (draft)
  1119   o  0:a5a1faba8d26 p (draft)
  1120   
  1120   
       
  1121   $ cd ..
       
  1122 
       
  1123 Testing that `hg split` preserve the phase of splitting cset(issue6048)
       
  1124 -----------------------------------------------------------------------
       
  1125 
       
  1126 Prepare the repository:
       
  1127   $ hg init issue6048
       
  1128   $ cd issue6048
       
  1129   $ echo a > a
       
  1130   $ hg ci -Am "added a"
       
  1131   adding a
       
  1132 
       
  1133   $ echo b > b
       
  1134   $ echo c > c
       
  1135   $ hg add b c
       
  1136   $ hg ci -m "added b c" --secret
       
  1137 
       
  1138   $ hg glog -l1 -p --git
       
  1139   @  1:12e9cc39ba19 added b c (secret)
       
  1140   |  diff --git a/b b/b
       
  1141   ~  new file mode 100644
       
  1142      --- /dev/null
       
  1143      +++ b/b
       
  1144      @@ -0,0 +1,1 @@
       
  1145      +b
       
  1146      diff --git a/c b/c
       
  1147      new file mode 100644
       
  1148      --- /dev/null
       
  1149      +++ b/c
       
  1150      @@ -0,0 +1,1 @@
       
  1151      +c
       
  1152   
       
  1153 To create commits with the number of split
       
  1154   $ echo 0 > num
       
  1155   $ cat > editor.sh << '__EOF__'
       
  1156   > NUM=$(cat num)
       
  1157   > NUM=`expr "$NUM" + 1`
       
  1158   > echo "$NUM" > num
       
  1159   > echo "split$NUM" > "$1"
       
  1160   > __EOF__
       
  1161   $ export HGEDITOR="\"sh\" \"editor.sh\""
       
  1162 
       
  1163 Splitting
       
  1164   $ hg split -r . << EOF
       
  1165   > y
       
  1166   > y
       
  1167   > n
       
  1168   > c
       
  1169   > EOF
       
  1170   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
       
  1171   adding b
       
  1172   adding c
       
  1173   diff --git a/b b/b
       
  1174   new file mode 100644
       
  1175   examine changes to 'b'? [Ynesfdaq?] y
       
  1176   
       
  1177   @@ -0,0 +1,1 @@
       
  1178   +b
       
  1179   record change 1/2 to 'b'? [Ynesfdaq?] y
       
  1180   
       
  1181   diff --git a/c b/c
       
  1182   new file mode 100644
       
  1183   examine changes to 'c'? [Ynesfdaq?] n
       
  1184   
       
  1185   created new head
       
  1186   (consider using topic for lightweight branches. See 'hg help topic')
       
  1187   continue splitting? [Ycdq?] c
       
  1188 
       
  1189   $ hg glog --git -p
       
  1190   @  3:1f8c09b13fa2 split2 (secret)
       
  1191   |  diff --git a/c b/c
       
  1192   |  new file mode 100644
       
  1193   |  --- /dev/null
       
  1194   |  +++ b/c
       
  1195   |  @@ -0,0 +1,1 @@
       
  1196   |  +c
       
  1197   |
       
  1198   o  2:bcba06966846 split1 (secret)
       
  1199   |  diff --git a/b b/b
       
  1200   |  new file mode 100644
       
  1201   |  --- /dev/null
       
  1202   |  +++ b/b
       
  1203   |  @@ -0,0 +1,1 @@
       
  1204   |  +b
       
  1205   |
       
  1206   o  0:9092f1db7931 added a (draft)
       
  1207      diff --git a/a b/a
       
  1208      new file mode 100644
       
  1209      --- /dev/null
       
  1210      +++ b/a
       
  1211      @@ -0,0 +1,1 @@
       
  1212      +a
       
  1213