tests/test-histedit-base.t
changeset 29887 6d66200bff3b
parent 29069 e2a1648a6ce7
child 34489 270e344a6c74
equal deleted inserted replaced
29886:e2c086f147ef 29887:6d66200bff3b
   233   > base d273e35dcdf2 B
   233   > base d273e35dcdf2 B
   234   > pick e8c55b19d366 J
   234   > pick e8c55b19d366 J
   235   > base d273e35dcdf2 B
   235   > base d273e35dcdf2 B
   236   > pick b2f90fd8aa85 I
   236   > pick b2f90fd8aa85 I
   237   > EOF
   237   > EOF
   238   hg: parse error: base "d273e35dcdf2" changeset was not an edited list candidate
   238   hg: parse error: base "d273e35dcdf2" changeset was an edited list candidate
   239   (only use listed changesets)
   239   (base must only use unlisted changesets)
   240 
   240 
   241   $ hg --config experimental.histeditng=False histedit 5 --commands - 2>&1 << EOF | fixbundle
   241   $ hg --config experimental.histeditng=False histedit 5 --commands - 2>&1 << EOF | fixbundle
   242   > base cd010b8cd998 A
   242   > base cd010b8cd998 A
   243   > pick d273e35dcdf2 B
   243   > pick d273e35dcdf2 B
   244   > pick 03772da75548 X
   244   > pick 03772da75548 X