Mercurial > hg
view tests/test-mq-qrename @ 10396:65a90c8e11ee
prepush: add more precise error messages
Part of the patch is from timeless@mozdev.org
- indicate the branch name where there are multiple heads
- give better advice when hitting a possible race, where new heads are added
between discovery and the call to branchmap(). In that case, asking the user
to merge isn't helpful, since only remote has the changes.
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Mon, 08 Feb 2010 19:44:04 +0100 |
parents | 05a682c8907d |
children | 0c944b7af564 |
line wrap: on
line source
#!/bin/sh echo "[extensions]" >> $HGRCPATH echo "mq=" >> $HGRCPATH hg init a cd a echo 'base' > base hg ci -Ambase -d '1 0' hg qnew -mmqbase mqbase hg qrename mqbase renamed mkdir .hg/patches/foo hg qrename renamed foo hg qseries ls .hg/patches/foo mkdir .hg/patches/bar hg qrename foo/renamed bar hg qseries ls .hg/patches/bar hg qrename bar/renamed baz hg qseries ls .hg/patches/baz cd .. echo % test patch being renamed before committed hg init b cd b hg qinit -c hg qnew x hg qrename y hg qcommit -m rename cd ..