tests/test-push-warn
branchstable
changeset 10771 01f097c4ae66
parent 10354 844d83da2da9
child 10875 a9702c47a19f
equal deleted inserted replaced
10770:fe39f0160c74 10771:01f097c4ae66
   164 hg -R k merge b
   164 hg -R k merge b
   165 hg -R k ci -m merge
   165 hg -R k ci -m merge
   166 hg -R k push -r a j
   166 hg -R k push -r a j
   167 echo
   167 echo
   168 
   168 
       
   169 echo % prepush -r should not allow you to sneak in new heads
       
   170 hg init l
       
   171 cd l
       
   172 echo a >> foo
       
   173 hg -q add foo
       
   174 hg -q branch a
       
   175 hg -q ci -d '0 0' -ma
       
   176 hg -q up null
       
   177 echo a >> foo
       
   178 hg -q add foo
       
   179 hg -q branch b
       
   180 hg -q ci -d '0 0' -mb
       
   181 cd ..
       
   182 hg -q clone l m -u a
       
   183 cd m
       
   184 hg -q merge b
       
   185 hg -q ci -d '0 0' -mmb
       
   186 hg -q up 0
       
   187 echo a >> foo
       
   188 hg -q ci -ma2
       
   189 hg -q up 2
       
   190 echo a >> foo
       
   191 hg -q branch -f b
       
   192 hg -q ci -d '0 0' -mb2
       
   193 hg -q merge 3
       
   194 hg -q ci -d '0 0' -mma
       
   195 hg push ../l -b b
       
   196 
   169 exit 0
   197 exit 0