Mercurial > hg
view tests/test-copy2 @ 11715:4f9dfb54c8b5 stable
qpush --move: move the right patch even with comment lines
88fc876a4833 caused that we find the index of the moving patch in self.series
but look it up in self.full_series. The difference between these is that
full_series also contains comment lines, and we thus moved the wrong patch.
Use back self.full_series to find the moving patch, but take care of striping
the patch guard markers before comparing the patch name. Test cases have been
added for comments and empty lines in self.full_series, and for the case of
guarded patches.
Original patch contributed by Mads Kiilerich <mads@kiilerich.com>
author | Gilles Moris <gilles.moris@free.fr> |
---|---|
date | Sat, 10 Jul 2010 21:23:00 +0200 |
parents | e8d10d085f47 |
children |
line wrap: on
line source
#!/bin/sh hg init echo foo > foo echo "# should fail - foo is not managed" hg mv foo bar hg st -A hg add foo echo "# dry-run; print a warning that this is not a real copy; foo is added" hg mv --dry-run foo bar hg st -A echo "# should print a warning that this is not a real copy; bar is added" hg mv foo bar hg st -A echo "# should print a warning that this is not a real copy; foo is added" hg cp bar foo hg rm -f bar rm bar hg st -A hg commit -m1 echo "# copy --after to a nonexistant target filename" hg cp -A foo dummy echo "# dry-run; should show that foo is clean" hg copy --dry-run foo bar hg st -A echo "# should show copy" hg copy foo bar hg st -C echo "# shouldn't show copy" hg commit -m2 hg st -C echo "# should match" hg debugindex .hg/store/data/foo.i hg debugrename bar echo bleah > foo echo quux > bar hg commit -m3 echo "# should not be renamed" hg debugrename bar hg copy -f foo bar echo "# should show copy" hg st -C hg commit -m3 echo "# should show no parents for tip" hg debugindex .hg/store/data/bar.i echo "# should match" hg debugindex .hg/store/data/foo.i hg debugrename bar echo "# should show no copies" hg st -C echo "# copy --after on an added file" cp bar baz hg add baz hg cp -A bar baz hg st -C echo "# foo was clean:" hg st -AC foo echo "# but it's considered modified after a copy --after --force" hg copy -Af bar foo hg st -AC foo exit 0