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