Mercurial > hg

annotate tests/test-remove-new.t @ 12664:545ec1775021

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: handle no file parent in backwards merge (issue2364)
author Matt Mackall <mpm@selenic.com>
date Sat, 09 Oct 2010 14:50:20 -0500
parents 92e30e135581
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
12100
4d6bb7615564 tests: unify test-remove-new
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11346
diff changeset
1 test that 'hg commit' does not crash if the user removes a newly added file
11346
e740f36cfb4b tests: rename test-merge3 to test-add-remove.
Greg Ward <greg-hg@gerg.ca>
parents: 11177
diff changeset
2
12100
4d6bb7615564 tests: unify test-remove-new
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11346
diff changeset
3 $ hg init
4d6bb7615564 tests: unify test-remove-new
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11346
diff changeset
4 $ echo This is file a1 > a
4d6bb7615564 tests: unify test-remove-new
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11346
diff changeset
5 $ hg add a
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12100
diff changeset
6 $ hg commit -m "commit #0"
12100
4d6bb7615564 tests: unify test-remove-new
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11346
diff changeset
7 $ touch b
4d6bb7615564 tests: unify test-remove-new
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11346
diff changeset
8 $ hg add b
4d6bb7615564 tests: unify test-remove-new
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11346
diff changeset
9 $ rm b
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12100
diff changeset
10 $ hg commit -A -m"comment #1"
12100
4d6bb7615564 tests: unify test-remove-new
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11346
diff changeset
11 removing b
4d6bb7615564 tests: unify test-remove-new
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11346
diff changeset
12 nothing changed
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12156
diff changeset
13 [1]