Mercurial Mercurial > hg / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-diff-issue2761.t
author Yuya Nishihara <yuya@tcha.org>
Tue, 01 Dec 2020 19:32:36 +0900
changeset 46041 9c0db3671008
parent 17486 73e3e368bd42
child 49621 55c6ebd11cb9
permissions -rw-r--r--
log: do not override other filtering and sorting options by --bookmark This basically reimplements 0aa118f18d4b 'log: add bookmark option to "hg log"'. Before, any other filtering options but --rev were ignored. -G didn't work either since the ordering constraint wasn't enforced.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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















Mercurial