Mercurial > hg

annotate tests/test-remove-new @ 11715:4f9dfb54c8b5 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 e740f36cfb4b
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
800
ec85f9e6f3b1 Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 749
diff changeset
1 #!/bin/sh
402
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
2
11346
e740f36cfb4b tests: rename test-merge3 to test-add-remove.
Greg Ward <greg-hg@gerg.ca>
parents: 11177
diff changeset
3 # test that 'hg commit' does not crash if the user removes a
e740f36cfb4b tests: rename test-merge3 to test-add-remove.
Greg Ward <greg-hg@gerg.ca>
parents: 11177
diff changeset
4 # newly added file
e740f36cfb4b tests: rename test-merge3 to test-add-remove.
Greg Ward <greg-hg@gerg.ca>
parents: 11177
diff changeset
5
402
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
6 hg init
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
7 echo This is file a1 > a
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
8 hg add a
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 814
diff changeset
9 hg commit -m "commit #0" -d "1000000 0"
402
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
10 touch b
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
11 hg add b
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
12 rm b
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 814
diff changeset
13 hg commit -A -m"comment #1" -d "1000000 0"
11177
6a64813276ed commands: initial audit of exit codes
Matt Mackall <mpm@selenic.com>
parents: 1933
diff changeset
14 exit 0