Mercurial > hg
view tests/test-hgk.t @ 45283:f1fb9a079131
merge: add removefile() to mergeresult object
There are cases where some further calculation makes the file not needing to be
merged anymore and hence needs to be dropped in mergeresult object. This adds a
function for that.
Differential Revision: https://phab.mercurial-scm.org/D8821
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Fri, 24 Jul 2020 16:23:55 +0530 |
parents | 5fb1fc2e1281 |
children |
line wrap: on
line source
Minimal hgk check $ echo "[extensions]" >> $HGRCPATH $ echo "hgk=" >> $HGRCPATH $ hg init repo $ cd repo $ echo a > a $ hg ci -Am adda adding a $ hg debug-cat-file commit 0 tree a0c8bcbbb45c parent 000000000000 author test 0 0 revision 0 branch default phase draft adda $ echo b > b $ hg ci -Am addb adding b $ hg log -T '{node}\n' 102a90ea7b4a3361e4082ed620918c261189a36a 07f4944404050f47db2e5c5071e0e84e7a27bba9 $ hg debug-diff-tree 07f494440405 102a90ea7b4a :000000 100664 000000000000 1e88685f5dde N b b $ hg debug-diff-tree 07f494440405 102a90ea7b4a --patch diff --git a/b b/b new file mode 100644 --- /dev/null +++ b/b @@ -0,0 +1,1 @@ +b Ensure that diff-tree output isn't affected by diffopts $ hg --config diff.noprefix=True debug-diff-tree 07f494440405 102a90ea7b4a :000000 100664 000000000000 1e88685f5dde N b b $ hg --config diff.noprefix=True debug-diff-tree --patch 07f494440405 102a90ea7b4a diff --git a/b b/b new file mode 100644 --- /dev/null +++ b/b @@ -0,0 +1,1 @@ +b $ cd ..