Mercurial > hg
view tests/test-hgk.t @ 44720:601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Previously, posting a new review for a non head commit would orphan the head.
The general case is any descendant of the selected revisions got orphaned if
this was the first time the selected revisions were submitted. It doesn't
happen when resubmitting. I've already had coworkers hit this a few times and
get confused. Since posting a review isn't generally thought of as an editing
operation, it would probably be easier for new users if we just restacked.
This avoids restacking existing orphans around the submission because that may
involve merge conflict resolution. Users who already have orphans should know
how to stabilize them anyway.
Differential Revision: https://phab.mercurial-scm.org/D8438
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Tue, 14 Apr 2020 18:51:23 -0400 |
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 ..