tests/test-push-warn
branchstable
changeset 9954 d6a307719ccb
parent 9609 aa404f3f661b
child 10354 844d83da2da9
equal deleted inserted replaced
9952:5b149c88d9e8 9954:d6a307719ccb
   138 echo c > i/c
   138 echo c > i/c
   139 hg -R i ci -Am c
   139 hg -R i ci -Am c
   140 hg -R i push h
   140 hg -R i push h
   141 echo
   141 echo
   142 
   142 
       
   143 echo % check prepush logic with merged branches
       
   144 hg init j
       
   145 hg -R j branch a
       
   146 echo init > j/foo
       
   147 hg -R j ci -Am init
       
   148 hg clone j k
       
   149 echo a1 > j/foo
       
   150 hg -R j ci -m a1
       
   151 hg -R k branch b
       
   152 echo b > k/foo
       
   153 hg -R k ci -m b
       
   154 hg -R k up 0
       
   155 hg -R k merge b
       
   156 hg -R k ci -m merge
       
   157 hg -R k push -r a j
       
   158 echo
       
   159 
   143 exit 0
   160 exit 0