Mercurial > hg

annotate tests/test-diff-issue2761.t @ 21947:b081decd9062 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: add parenthesis around "no more unresolved files" message This message may be confused with an error message. Adding parenthesis around it will make it more recognisable as an informative message.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Sat, 26 Jul 2014 03:32:49 +0200
parents 73e3e368bd42
children 55c6ebd11cb9
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
13929
cff56a0ed18e localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
1 Test issue2761
cff56a0ed18e localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
2
cff56a0ed18e localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
3 $ hg init
cff56a0ed18e localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
4
cff56a0ed18e localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
5 $ touch to-be-deleted
cff56a0ed18e localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
6 $ hg add
cff56a0ed18e localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
7 adding to-be-deleted
cff56a0ed18e localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
8 $ hg ci -m first
cff56a0ed18e localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
9 $ echo a > to-be-deleted
cff56a0ed18e localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
10 $ hg ci -m second
cff56a0ed18e localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
11 $ rm to-be-deleted
cff56a0ed18e localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
12 $ hg diff -r 0
cff56a0ed18e localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
13
cff56a0ed18e localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
14 Same issue, different code path
cff56a0ed18e localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
15
cff56a0ed18e localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
16 $ hg up -C
cff56a0ed18e localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
17 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
17486
73e3e368bd42 spelling: doesn't/does not
timeless@mozdev.org
parents: 13929
diff changeset
18 $ touch does-not-exist-in-1
13929
cff56a0ed18e localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
19 $ hg add
17486
73e3e368bd42 spelling: doesn't/does not
timeless@mozdev.org
parents: 13929
diff changeset
20 adding does-not-exist-in-1
13929
cff56a0ed18e localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
21 $ hg ci -m third
17486
73e3e368bd42 spelling: doesn't/does not
timeless@mozdev.org
parents: 13929
diff changeset
22 $ rm does-not-exist-in-1
13929
cff56a0ed18e localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
23 $ hg diff -r 1