Mercurial Mercurial > hg-stable / 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-dispatch.py.out
author Pulkit Goyal <7895pulkit@gmail.com>
Wed, 09 Sep 2020 16:49:19 +0530
changeset 45530 6877b0ee5f9d
parent 38038 6f9ac3cb0987
permissions -rw-r--r--
mergestate: introduce a new ACTION_KEEP_NEW `ACTION_KEEP` is overloaded and it's hard to figure out how we end up with this KEEP, what was the state of things. In a previous patch, we introduced `ACTION_KEEP_ABSENT` which represents files which are kept absent in the working directory. There is another special case where we keep the file when it's not present on both ancestor and remote side. We introduce a dedicated action for that. The goal is to use these information to make bid merge smarter. Differential Revision: https://phab.mercurial-scm.org/D9002
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5095
f3f033def181 Added test for commands.dispatch (especially 88803a69b24)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset 
     1
 
running: init test1
38038
6f9ac3cb0987 dispatch: unify handling of None returned by a command function
Yuya Nishihara <yuya@tcha.org>
parents: 5688
diff changeset 
     2
 
result: 0
5095
f3f033def181 Added test for commands.dispatch (especially 88803a69b24)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset 
     3
 
running: add foo
5688
883d887c6408 commands: add exits(1) if a specified file cannot be added (issue 891)
Patrick Mezard <pmezard@gmail.com>
parents: 5095
diff changeset 
     4
 
result: 0
5095
f3f033def181 Added test for commands.dispatch (especially 88803a69b24)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset 
     5
 
running: commit -m commit1 -d 2000-01-01 foo
38038
6f9ac3cb0987 dispatch: unify handling of None returned by a command function
Yuya Nishihara <yuya@tcha.org>
parents: 5688
diff changeset 
     6
 
result: 0
5095
f3f033def181 Added test for commands.dispatch (especially 88803a69b24)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset 
     7
 
running: commit -m commit2 -d 2000-01-02 foo
38038
6f9ac3cb0987 dispatch: unify handling of None returned by a command function
Yuya Nishihara <yuya@tcha.org>
parents: 5688
diff changeset 
     8
 
result: 0
5095
f3f033def181 Added test for commands.dispatch (especially 88803a69b24)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset 
     9
 
running: log -r 0
f3f033def181 Added test for commands.dispatch (especially 88803a69b24)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset 
    10
 
changeset:   0:0e4634943879
f3f033def181 Added test for commands.dispatch (especially 88803a69b24)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset 
    11
 
user:        test
f3f033def181 Added test for commands.dispatch (especially 88803a69b24)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset 
    12
 
date:        Sat Jan 01 00:00:00 2000 +0000
f3f033def181 Added test for commands.dispatch (especially 88803a69b24)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset 
    13
 
summary:     commit1
f3f033def181 Added test for commands.dispatch (especially 88803a69b24)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset 
    14
 







38038






6f9ac3cb0987
dispatch: unify handling of None returned by a command function



Yuya Nishihara <yuya@tcha.org>


parents: 
5688

diff
changeset




    15


result: 0








5095






f3f033def181
Added test for commands.dispatch (especially 88803a69b24)



Thomas Arendsen Hein <thomas@intevation.de>


parents: 

diff
changeset




    16


running: log -r tip













f3f033def181
Added test for commands.dispatch (especially 88803a69b24)



Thomas Arendsen Hein <thomas@intevation.de>


parents: 

diff
changeset




    17


changeset:   1:45589e459b2e













f3f033def181
Added test for commands.dispatch (especially 88803a69b24)



Thomas Arendsen Hein <thomas@intevation.de>


parents: 

diff
changeset




    18


tag:         tip













f3f033def181
Added test for commands.dispatch (especially 88803a69b24)



Thomas Arendsen Hein <thomas@intevation.de>


parents: 

diff
changeset




    19


user:        test













f3f033def181
Added test for commands.dispatch (especially 88803a69b24)



Thomas Arendsen Hein <thomas@intevation.de>


parents: 

diff
changeset




    20


date:        Sun Jan 02 00:00:00 2000 +0000













f3f033def181
Added test for commands.dispatch (especially 88803a69b24)



Thomas Arendsen Hein <thomas@intevation.de>


parents: 

diff
changeset




    21


summary:     commit2













f3f033def181
Added test for commands.dispatch (especially 88803a69b24)



Thomas Arendsen Hein <thomas@intevation.de>


parents: 

diff
changeset




    22









38038






6f9ac3cb0987
dispatch: unify handling of None returned by a command function



Yuya Nishihara <yuya@tcha.org>


parents: 
5688

diff
changeset




    23


result: 0















hg-stable