tests/test-update-branches.t
changeset 28029 72072cfc7e91
parent 26713 a271925699d6
child 28065 6b1fc09c699a
equal deleted inserted replaced
28028:ac49ecb2a897 28029:72072cfc7e91
   165   parent=1
   165   parent=1
   166   M sub/suba
   166   M sub/suba
   167 
   167 
   168   $ norevtest '-c clean same'   clean 2 -c
   168   $ norevtest '-c clean same'   clean 2 -c
   169   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   169   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
   170   1 other heads for branch "default"
   170   parent=3
   171   parent=3
   171 
   172 
   172   $ revtest '-cC dirty linear'  dirty 1 2 -cC
   173   $ revtest '-cC dirty linear'  dirty 1 2 -cC
   173   abort: cannot specify both -c/--check and -C/--clean
   174   abort: cannot specify both -c/--check and -C/--clean
   174   parent=1
   175   parent=1