Mercurial > hg
view tests/test-close-head.t @ 42050:03f6480bfdda
unshelve: disable unshelve during merge (issue5123)
As stated in the issue5123, unshelve can destroy the second parent of
the context when tried to unshelve with an uncommitted merge. This
patch makes unshelve to abort when called with an uncommitted merge.
See how shelve.mergefiles works. Commit structure looks like this:
```
... -> pctx -> tmpwctx -> shelvectx
/
/
second
merge parent
pctx = parent before merging working context(first merge parent)
tmpwctx = commited working directory after merge(with two parents)
shelvectx = shelved context
```
shelve.mergefiles first updates to pctx then it reverts shelvectx to pctx with:
```
cmdutil.revert(ui, repo, shelvectx, repo.dirstate.parents(),
*pathtofiles(repo, files),
**{'no_backup': True})
```
Reverting tmpwctx files that were merged from second parent to pctx makes them
added because they are not in pctx.
Changing this revert operation is crucial to restore parents after unshelve.
This is a complicated issue as this is not fixing a regression. Thus, for the
time being, unshelve during an uncommitted merge can be aborted.
(Details taken from http://mercurial.808500.n3.nabble.com/PATCH-V3-shelve-restore-parents-after-unshelve-issue5123-tt4036858.html#a4037408)
Differential Revision: https://phab.mercurial-scm.org/D6169
author | Navaneeth Suresh <navaneeths1998@gmail.com> |
---|---|
date | Mon, 25 Mar 2019 12:33:41 +0530 |
parents | 12a72729678e |
children | c51b103220c7 |
line wrap: on
line source
$ hg init test-content $ cd test-content $ hg debugbuilddag '+2*2*3*4+7' $ hg bookmark -r 1 @ $ hg log -G --template '{rev}:{node|short}' o 11:1d876b1f862c | o 10:ea5f71948eb8 | o 9:f1b0356d867a | o 8:e8d1253fb0d7 | o 7:d423bbba4459 | o 6:a2f58e9c1e56 | o 5:3a367db1fabc | o 4:e7bd5218ca15 | | o 3:6100d3090acf |/ | o 2:fa942426a6fd |/ | o 1:66f7d451a68b |/ o 0:1ea73414a91b $ hg --config extensions.closehead= close-head -m 'Not a head' 0 1 abort: revision is not an open head: 0 [255] $ hg --config extensions.closehead= close-head -m 'Not a head' -r 0 1 abort: revision is not an open head: 0 [255] $ hg --config extensions.closehead= close-head -m 'Close old heads' -r 1 2 $ hg bookmark @ 1:66f7d451a68b $ hg heads changeset: 11:1d876b1f862c user: debugbuilddag date: Thu Jan 01 00:00:11 1970 +0000 summary: r11 changeset: 3:6100d3090acf parent: 0:1ea73414a91b user: debugbuilddag date: Thu Jan 01 00:00:03 1970 +0000 summary: r3 $ hg --config extensions.closehead= close-head -m 'Close more old heads' -r 11 $ hg heads changeset: 3:6100d3090acf parent: 0:1ea73414a91b user: debugbuilddag date: Thu Jan 01 00:00:03 1970 +0000 summary: r3 $ hg --config extensions.closehead= close-head -m 'Not a head' 0 abort: revision is not an open head: 0 [255] $ hg --config extensions.closehead= close-head -m 'Already closed head' 1 abort: revision is not an open head: 1 [255] $ hg init ../test-empty $ cd ../test-empty $ hg debugbuilddag '+1' $ hg log -G --template '{rev}:{node|short}' o 0:1ea73414a91b $ hg --config extensions.closehead= close-head -m 'Close initial revision' 0 $ hg heads [1]