Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-mq-merge @ 4519:5a9e767c2908
Include convert extension in packages setup
(reported by Christian Ebert and Eric Hopper)
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Thu, 07 Jun 2007 22:28:52 +0200 |
parents | a210b40d0860 |
children |
line wrap: on
line source
#!/bin/sh # Test issue 529 - mq aborts when merging patch deleting files rewrite_path() { sed -e 's:\\:/:g' -e 's:[^ ]*/t/::g' } echo "[extensions]" >> $HGRCPATH echo "hgext.mq=" >> $HGRCPATH # Commit two dummy files in "init" changeset hg init t cd t echo a > a echo b > b hg ci -Am init hg tag -l init # Create a patch removing a hg qnew rm_a hg rm a hg qrefresh -m "rm a" # Save the patch queue so we can merge it later hg qsave -c -e 2>&1 | rewrite_path # Update b and commit in an "update" changeset hg up -C init echo b >> b hg st hg ci -m update # Here, qpush used to abort with : # The system cannot find the file specified => a hg manifest hg qpush -a -m 2>&1 | rewrite_path hg manifest # ensure status is correct after merge hg qpop -a