Mercurial > hg
view tests/test-issue619 @ 5439:d0c67b52ac01
convert: make contents of "extra" dict available from sources, for sinks.
This breaks hash preservation for hg->hg conversion, as each converted
change gets a convert_revision item added to its extra dict. Ugh.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Wed, 10 Oct 2007 15:30:00 -0700 |
parents | 8808ea7da86b |
children | 4c94b6d0fb1c |
line wrap: on
line source
#!/bin/sh mkdir t cd t hg init echo a > a hg ci -Ama -d '1000000000 0' echo b > b hg branch b hg ci -Amb -d '1000000000 0' hg co -C 0 echo fast-forward hg merge b hg ci -Ammerge -d '1000000000 0' echo bogus fast-forward should fail hg merge b echo done