tests/test-evolve.t
branchmercurial-4.6
changeset 3993 85c99079d41f
parent 3909 f7afd3a158e3
parent 3978 fb8e44c70798
child 3995 684cc3418ecd
child 4074 eb4d07a0b19f
equal deleted inserted replaced
3933:1194c850fe2a 3993:85c99079d41f
  1541   $ glog -r "be23044af550::" --hidden
  1541   $ glog -r "be23044af550::" --hidden
  1542   @  38:61abd81de026@default(draft) will be evolved safely
  1542   @  38:61abd81de026@default(draft) will be evolved safely
  1543   |
  1543   |
  1544   o  37:df89d30f23e2@default(draft) amended
  1544   o  37:df89d30f23e2@default(draft) amended
  1545   |
  1545   |
  1546   | *  36:59c37c5bebd1@default(draft) will cause conflict at evolve
  1546   | @  36:59c37c5bebd1@default(draft) will cause conflict at evolve
  1547   | |
  1547   | |
  1548   | x  35:7cc12c6c7862@default(draft) will be evolved safely
  1548   | x  35:7cc12c6c7862@default(draft) will be evolved safely
  1549   | |
  1549   | |
  1550   | x  34:98c7ab460e6b@default(draft) will be amended
  1550   | x  34:98c7ab460e6b@default(draft) will be amended
  1551   |/
  1551   |/