Mercurial Mercurial > hg > mercurial-crew-with-dirclash / 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-empty-file.out
author Dirkjan Ochtman <dirkjan@ochtman.nl>
Tue, 25 Sep 2007 19:05:34 +0200
changeset 5337 8c5ef3b87cb1
parent 3506 9de0e64545a3
child 5405 8feb33c2d153
permissions -rw-r--r--
Don't try to determine interactivity if ui() called with interactive=False. WSGI applications are not supposed to refer to sys.stdin. In ed6df6b1c29a, hgweb and hgwebdir were fixed to pass interactive=False to their ui()'s, but sys.stdin.isatty() was still called by the ui objects. This change makes sure only the ui.fixconfig() method will call ui.isatty() (by making the ui._readline() method, which is currently only called from ui.prompt(), private). ui.fixconfig() is changed to let config files override the initial interactivity setting, but not check isatty() if interactive=False was specified in the creation of the ui.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3506
9de0e64545a3 Test that we notice the empty files from the second parent during a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     1
 
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
9de0e64545a3 Test that we notice the empty files from the second parent during a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     2
 
changeset:   2:62ec0e86d1e5
9de0e64545a3 Test that we notice the empty files from the second parent during a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     3
 
tag:         tip
9de0e64545a3 Test that we notice the empty files from the second parent during a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     4
 
parent:      0:567dde5e6e98
9de0e64545a3 Test that we notice the empty files from the second parent during a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     5
 
user:        test
9de0e64545a3 Test that we notice the empty files from the second parent during a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     6
 
date:        Mon Jan 12 13:46:40 1970 +0000
9de0e64545a3 Test that we notice the empty files from the second parent during a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     7
 
summary:     add empty3
9de0e64545a3 Test that we notice the empty files from the second parent during a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     8
 












9de0e64545a3
Test that we notice the empty files from the second parent during a merge



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




     9


changeset:   1:41ab7b321727













9de0e64545a3
Test that we notice the empty files from the second parent during a merge



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    10


user:        test













9de0e64545a3
Test that we notice the empty files from the second parent during a merge



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    11


date:        Mon Jan 12 13:46:40 1970 +0000













9de0e64545a3
Test that we notice the empty files from the second parent during a merge



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    12


summary:     add empty2













9de0e64545a3
Test that we notice the empty files from the second parent during a merge



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    13














9de0e64545a3
Test that we notice the empty files from the second parent during a merge



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    14


1 files updated, 0 files merged, 0 files removed, 0 files unresolved













9de0e64545a3
Test that we notice the empty files from the second parent during a merge



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    15


(branch merge, don't forget to commit)













9de0e64545a3
Test that we notice the empty files from the second parent during a merge



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    16


M empty2













9de0e64545a3
Test that we notice the empty files from the second parent during a merge



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    17


b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty1













9de0e64545a3
Test that we notice the empty files from the second parent during a merge



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    18


b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty2













9de0e64545a3
Test that we notice the empty files from the second parent during a merge



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    19


b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty3















mercurial-crew-with-dirclash