Mercurial > hg
view tests/test-diff-copy-depth @ 10672:c2e1e637d4da stable
rebase: always check if rebasing onto an applied mq patch.
Previously, it only checked for an mq patch if the user explicitly
passed -d/--dest. But rebasing onto an mq patch is a bad idea
regardless of how we determine the rebase destination.
author | Greg Ward <greg-hg@gerg.ca> |
---|---|
date | Tue, 02 Mar 2010 15:08:43 -0500 |
parents | 204a2ca249b6 |
children |
line wrap: on
line source
#!/bin/sh for i in aaa zzz; do hg init t cd t echo "-- With $i" touch file hg add file hg ci -m "Add" hg cp file $i hg ci -m "a -> $i" hg cp $i other-file echo "different" >> $i hg ci -m "$i -> other-file" hg cp other-file somename echo "Status": hg st -C echo echo "Diff:" hg diff -g echo cd .. rm -rf t done