tests/test-evolve.t
branchmercurial-4.4
changeset 3995 684cc3418ecd
parent 3930 d00f0c369bc7
parent 3993 85c99079d41f
child 4002 21eab0a99841
child 4076 f9a850018daa
equal deleted inserted replaced
3935:9af0e2b0bdd7 3995:684cc3418ecd
  1537   $ glog -r "be23044af550::" --hidden
  1537   $ glog -r "be23044af550::" --hidden
  1538   @  38:61abd81de026@default(draft) will be evolved safely
  1538   @  38:61abd81de026@default(draft) will be evolved safely
  1539   |
  1539   |
  1540   o  37:df89d30f23e2@default(draft) amended
  1540   o  37:df89d30f23e2@default(draft) amended
  1541   |
  1541   |
  1542   | o  36:59c37c5bebd1@default(draft) will cause conflict at evolve
  1542   | @  36:59c37c5bebd1@default(draft) will cause conflict at evolve
  1543   | |
  1543   | |
  1544   | x  35:7cc12c6c7862@default(draft) will be evolved safely
  1544   | x  35:7cc12c6c7862@default(draft) will be evolved safely
  1545   | |
  1545   | |
  1546   | x  34:98c7ab460e6b@default(draft) will be amended
  1546   | x  34:98c7ab460e6b@default(draft) will be amended
  1547   |/
  1547   |/