This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3479

update: print warning about hidden changeset after update
ClosedPublic

Authored by martinvonz on May 8 2018, 1:11 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGea63a2004d09: update: print warning about hidden changeset after update
Summary

When an attempt to update to a hidden changeset fails because the
working copy is dirty, you may get a message like this:

updating to a hidden changeset 343f6de32686
(hidden revision '343f6de32686' was rewritten as: 4ab941244072)
abort: conflicting changes
(commit or update --clean to discard changes)

It's easy to miss the real error here. This patch moves the warning
about the hidden changeset to after the update has happened. It
changes the verb tense accordingly (and drops the "a" that I think it
sounds better without). Of course, this means that the commit isn't
actually hidden anymore when the message is printed. I think that's
fine.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.May 8 2018, 1:11 AM
lothiraldan added a subscriber: lothiraldan.May 8 2018, 5:04 AM

Does it means that someone that try to update to a hidden changeset with a dirty conflicting workdir will first need to solve the conflict before seeing that the changeset is hidden and that it could be potentially the source of the conflict?

martinvonz updated this revision to Diff 8556.May 8 2018, 2:18 PM
martinvonz added a comment.May 8 2018, 2:19 PM
In D3479#55208, @lothiraldan wrote:

Does it means that someone that try to update to a hidden changeset with a dirty conflicting workdir will first need to solve the conflict before seeing that the changeset is hidden and that it could be potentially the source of the conflict?

Added test case for that. It wasn't working before because I was checking "not ret". I think I had been writing too much C code recently.

pulkit accepted this revision.May 9 2018, 6:14 PM
Closed by commit rHGea63a2004d09: update: print warning about hidden changeset after update (authored by martinvonz). · Explain WhyMay 10 2018, 6:42 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 8556

mercurial/commands.py

rev = cmdutil.finddate(ui, repo, date) rev = cmdutil.finddate(ui, repo, date)
# if we defined a bookmark, we have to remember the original name # if we defined a bookmark, we have to remember the original name
brev = rev brev = rev
if rev: if rev:
repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn') repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
ctx = scmutil.revsingle(repo, rev, rev) ctx = scmutil.revsingle(repo, rev, rev)
rev = ctx.rev() rev = ctx.rev()
if ctx.hidden(): hidden = ctx.hidden()
repo.ui.setconfig('ui', 'forcemerge', opts.get(r'tool'), 'update')
ret = hg.updatetotally(ui, repo, rev, brev, clean=clean,
updatecheck=updatecheck)
if hidden:
ctxstr = ctx.hex()[:12] ctxstr = ctx.hex()[:12]
ui.warn(_("updating to a hidden changeset %s\n") % ctxstr) ui.warn(_("updated to hidden changeset %s\n") % ctxstr)
if ctx.obsolete(): if ctx.obsolete():
obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx) obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
ui.warn("(%s)\n" % obsfatemsg) ui.warn("(%s)\n" % obsfatemsg)
return ret
repo.ui.setconfig('ui', 'forcemerge', opts.get(r'tool'), 'update')
return hg.updatetotally(ui, repo, rev, brev, clean=clean,
updatecheck=updatecheck)
@command('verify', []) @command('verify', [])
def verify(ui, repo): def verify(ui, repo):
"""verify the integrity of the repository """verify the integrity of the repository
Verify the integrity of the current repository. Verify the integrity of the current repository.
This will perform an extensive check of the repository's This will perform an extensive check of the repository's

tests/test-directaccess.t

`hg archive` `hg archive`
This should not throw error This should not throw error
$ hg archive -r 28ad74 foo $ hg archive -r 28ad74 foo
`hg update` `hg update`
$ hg up 28ad74 $ hg up 28ad74
updating to a hidden changeset 28ad74487de9
(hidden revision '28ad74487de9' was rewritten as: 2443a0e66469)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to hidden changeset 28ad74487de9
(hidden revision '28ad74487de9' was rewritten as: 2443a0e66469)
$ hg up 3 $ hg up 3
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg up $ hg up
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
`hg revert` `hg revert`

tests/test-log.t

$ hg log -r a $ hg log -r a
abort: hidden revision 'a' is pruned! abort: hidden revision 'a' is pruned!
(use --hidden to access hidden revisions) (use --hidden to access hidden revisions)
[255] [255]
test that parent prevent a changeset to be hidden test that parent prevent a changeset to be hidden
$ hg up 1 -q --hidden $ hg up 1 -q --hidden
updating to a hidden changeset a765632148dc updated to hidden changeset a765632148dc
(hidden revision 'a765632148dc' is pruned) (hidden revision 'a765632148dc' is pruned)
$ hg log --template='{rev}:{node}\n' $ hg log --template='{rev}:{node}\n'
1:a765632148dc55d38c35c4f247c618701886cb2f 1:a765632148dc55d38c35c4f247c618701886cb2f
0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
test that second parent prevent a changeset to be hidden too test that second parent prevent a changeset to be hidden too
$ hg debugsetparents 0 1 # nothing suitable to merge here $ hg debugsetparents 0 1 # nothing suitable to merge here

tests/test-obshistory.t

Actual test Actual test
----------- -----------
$ hg update 471f378eab4c $ hg update 471f378eab4c
abort: hidden revision '471f378eab4c' was rewritten as: 4ae3a4151de9! abort: hidden revision '471f378eab4c' was rewritten as: 4ae3a4151de9!
(use --hidden to access hidden revisions) (use --hidden to access hidden revisions)
[255] [255]
$ hg update --hidden "desc(A0)" $ hg update --hidden "desc(A0)"
updating to a hidden changeset 471f378eab4c
(hidden revision '471f378eab4c' was rewritten as: 4ae3a4151de9)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to hidden changeset 471f378eab4c
(hidden revision '471f378eab4c' was rewritten as: 4ae3a4151de9)
Test output with pruned commit Test output with pruned commit
============================== ==============================
Test setup Test setup
---------- ----------
$ hg init $TESTTMP/local-prune $ hg init $TESTTMP/local-prune
----------- -----------
$ hg up 1 $ hg up 1
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg up 0dec01379d3b $ hg up 0dec01379d3b
abort: hidden revision '0dec01379d3b' is pruned! abort: hidden revision '0dec01379d3b' is pruned!
(use --hidden to access hidden revisions) (use --hidden to access hidden revisions)
[255] [255]
$ hg up --hidden -r 'desc(B0)' $ hg up --hidden -r 'desc(B0)'
updating to a hidden changeset 0dec01379d3b
(hidden revision '0dec01379d3b' is pruned)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to hidden changeset 0dec01379d3b
(hidden revision '0dec01379d3b' is pruned)
Test output with splitted commit Test output with splitted commit
================================ ================================
Test setup Test setup
---------- ----------
$ hg init $TESTTMP/local-split $ hg init $TESTTMP/local-split
Actual test Actual test
----------- -----------
$ hg update 471597cad322 $ hg update 471597cad322
abort: hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a! abort: hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a!
(use --hidden to access hidden revisions) (use --hidden to access hidden revisions)
[255] [255]
$ hg update --hidden 'min(desc(A0))' $ hg update --hidden 'min(desc(A0))'
updating to a hidden changeset 471597cad322
(hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a)
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to hidden changeset 471597cad322
(hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a)
Test output with lots of splitted commit Test output with lots of splitted commit
======================================== ========================================
Test setup Test setup
---------- ----------
$ hg init $TESTTMP/local-lots-split $ hg init $TESTTMP/local-lots-split
Actual test Actual test
----------- -----------
$ hg update de7290d8b885 $ hg update de7290d8b885
abort: hidden revision 'de7290d8b885' was split as: 337fec4d2edc, f257fde29c7a and 2 more! abort: hidden revision 'de7290d8b885' was split as: 337fec4d2edc, f257fde29c7a and 2 more!
(use --hidden to access hidden revisions) (use --hidden to access hidden revisions)
[255] [255]
$ hg update --hidden 'min(desc(A0))' $ hg update --hidden 'min(desc(A0))'
updating to a hidden changeset de7290d8b885
(hidden revision 'de7290d8b885' was split as: 337fec4d2edc, f257fde29c7a and 2 more)
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to hidden changeset de7290d8b885
(hidden revision 'de7290d8b885' was split as: 337fec4d2edc, f257fde29c7a and 2 more)
Test output with folded commit Test output with folded commit
============================== ==============================
Test setup Test setup
---------- ----------
$ hg init $TESTTMP/local-fold $ hg init $TESTTMP/local-fold
Actual test Actual test
----------- -----------
$ hg update 471f378eab4c $ hg update 471f378eab4c
abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192! abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192!
(use --hidden to access hidden revisions) (use --hidden to access hidden revisions)
[255] [255]
$ hg update --hidden 'desc(A0)' $ hg update --hidden 'desc(A0)'
updating to a hidden changeset 471f378eab4c
(hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
updated to hidden changeset 471f378eab4c
(hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
$ hg update 0dec01379d3b $ hg update 0dec01379d3b
abort: hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192! abort: hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192!
(use --hidden to access hidden revisions) (use --hidden to access hidden revisions)
[255] [255]
$ hg update --hidden 'desc(B0)' $ hg update --hidden 'desc(B0)'
updating to a hidden changeset 0dec01379d3b
(hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to hidden changeset 0dec01379d3b
(hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
Test output with divergence Test output with divergence
=========================== ===========================
Test setup Test setup
---------- ----------
$ hg init $TESTTMP/local-divergence $ hg init $TESTTMP/local-divergence
| summary: A0 | summary: A0
| |
o changeset: 0:ea207398892e o changeset: 0:ea207398892e
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: ROOT summary: ROOT
$ hg update --hidden 'desc(A0)' $ hg update --hidden 'desc(A0)'
updating to a hidden changeset 471f378eab4c
(hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a)
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to hidden changeset 471f378eab4c
(hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a)
$ hg commit --amend -m "A2" $ hg commit --amend -m "A2"
2 new content-divergent changesets 2 new content-divergent changesets
$ hg log --hidden -G $ hg log --hidden -G
@ changeset: 3:65b757b745b9 @ changeset: 3:65b757b745b9
| tag: tip | tag: tip
| parent: 0:ea207398892e | parent: 0:ea207398892e
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
Actual test Actual test
----------- -----------
$ hg update 471f378eab4c $ hg update 471f378eab4c
abort: hidden revision '471f378eab4c' has diverged! abort: hidden revision '471f378eab4c' has diverged!
(use --hidden to access hidden revisions) (use --hidden to access hidden revisions)
[255] [255]
$ hg update --hidden 'desc(A0)' $ hg update --hidden 'desc(A0)'
updating to a hidden changeset 471f378eab4c
(hidden revision '471f378eab4c' has diverged)
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to hidden changeset 471f378eab4c
(hidden revision '471f378eab4c' has diverged)
Test output with amended + folded commit Test output with amended + folded commit
======================================== ========================================
Test setup Test setup
---------- ----------
$ hg init $TESTTMP/local-amend-fold $ hg init $TESTTMP/local-amend-fold
Actual test Actual test
----------- -----------
$ hg update 471f378eab4c $ hg update 471f378eab4c
abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192! abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192!
(use --hidden to access hidden revisions) (use --hidden to access hidden revisions)
[255] [255]
$ hg update --hidden 'desc(A0)' $ hg update --hidden 'desc(A0)'
updating to a hidden changeset 471f378eab4c
(hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
updated to hidden changeset 471f378eab4c
(hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
$ hg update --hidden 0dec01379d3b $ hg update --hidden 0dec01379d3b
updating to a hidden changeset 0dec01379d3b
(hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to hidden changeset 0dec01379d3b
(hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
$ hg update 0dec01379d3b $ hg update 0dec01379d3b
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg update --hidden 'desc(B0)' $ hg update --hidden 'desc(B0)'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved

tests/test-obsmarker-template.t

o changeset: 0:ea207398892e o changeset: 0:ea207398892e
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: ROOT summary: ROOT
Check templates Check templates
--------------- ---------------
$ hg up 'desc(A0)' --hidden $ hg up 'desc(A0)' --hidden
updating to a hidden changeset 471f378eab4c
(hidden revision '471f378eab4c' was rewritten as: d004c8f274b9)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to hidden changeset 471f378eab4c
(hidden revision '471f378eab4c' was rewritten as: d004c8f274b9)
Predecessors template should show current revision as it is the working copy Predecessors template should show current revision as it is the working copy
$ hg tlog $ hg tlog
o d004c8f274b9 o d004c8f274b9
| Predecessors: 1:471f378eab4c | Predecessors: 1:471f378eab4c
| semi-colon: 1:471f378eab4c | semi-colon: 1:471f378eab4c
| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
| summary: A0 | summary: A0
| |
o changeset: 0:ea207398892e o changeset: 0:ea207398892e
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: ROOT summary: ROOT
$ hg up 'desc(A1)' --hidden $ hg up 'desc(A1)' --hidden
updating to a hidden changeset a468dc9b3633
(hidden revision 'a468dc9b3633' was rewritten as: d004c8f274b9)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to hidden changeset a468dc9b3633
(hidden revision 'a468dc9b3633' was rewritten as: d004c8f274b9)
Predecessors template should show current revision as it is the working copy Predecessors template should show current revision as it is the working copy
$ hg tlog $ hg tlog
o d004c8f274b9 o d004c8f274b9
| Predecessors: 2:a468dc9b3633 | Predecessors: 2:a468dc9b3633
| semi-colon: 2:a468dc9b3633 | semi-colon: 2:a468dc9b3633
| json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"] | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]
| map: 2:a468dc9b36338b14fdb7825f55ce3df4e71517ad | map: 2:a468dc9b36338b14fdb7825f55ce3df4e71517ad
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: ROOT summary: ROOT
Check templates Check templates
--------------- ---------------
$ hg up 'obsolete()' --hidden $ hg up 'obsolete()' --hidden
updating to a hidden changeset 471597cad322
(hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a)
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to hidden changeset 471597cad322
(hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a)
Predecessors template should show current revision as it is the working copy Predecessors template should show current revision as it is the working copy
$ hg tlog $ hg tlog
o f257fde29c7a o f257fde29c7a
| Predecessors: 1:471597cad322 | Predecessors: 1:471597cad322
| semi-colon: 1:471597cad322 | semi-colon: 1:471597cad322
| json: ["471597cad322d1f659bb169751be9133dad92ef3"] | json: ["471597cad322d1f659bb169751be9133dad92ef3"]
| map: 1:471597cad322d1f659bb169751be9133dad92ef3 | map: 1:471597cad322d1f659bb169751be9133dad92ef3
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: ROOT summary: ROOT
Check templates Check templates
--------------- ---------------
$ hg up 'desc(A0)' --hidden $ hg up 'desc(A0)' --hidden
updating to a hidden changeset 471f378eab4c
(hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
updated to hidden changeset 471f378eab4c
(hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
Predecessors template should show current revision as it is the working copy Predecessors template should show current revision as it is the working copy
$ hg tlog $ hg tlog
o eb5a0daa2192 o eb5a0daa2192
| Predecessors: 1:471f378eab4c | Predecessors: 1:471f378eab4c
| semi-colon: 1:471f378eab4c | semi-colon: 1:471f378eab4c
| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
| @ 471f378eab4c | @ 471f378eab4c
|/ Successors: 3:eb5a0daa2192 |/ Successors: 3:eb5a0daa2192
| multi-line: 3:eb5a0daa2192 | multi-line: 3:eb5a0daa2192
| json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
o ea207398892e o ea207398892e
$ hg fatelog $ hg fatelog
o eb5a0daa2192 o eb5a0daa2192
| |
| @ 471f378eab4c | @ 471f378eab4c
|/ Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); |/ Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
o ea207398892e o ea207398892e
$ hg up 'desc(B0)' --hidden $ hg up 'desc(B0)' --hidden
updating to a hidden changeset 0dec01379d3b
(hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to hidden changeset 0dec01379d3b
(hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
Predecessors template should show both predecessors as they should be both Predecessors template should show both predecessors as they should be both
displayed displayed
$ hg tlog $ hg tlog
o eb5a0daa2192 o eb5a0daa2192
| Predecessors: 2:0dec01379d3b 1:471f378eab4c | Predecessors: 2:0dec01379d3b 1:471f378eab4c
| semi-colon: 2:0dec01379d3b; 1:471f378eab4c | semi-colon: 2:0dec01379d3b; 1:471f378eab4c
| json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"] | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"]
| summary: A0 | summary: A0
| |
o changeset: 0:ea207398892e o changeset: 0:ea207398892e
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: ROOT summary: ROOT
$ hg update --hidden 'desc(A0)' $ hg update --hidden 'desc(A0)'
updating to a hidden changeset 471f378eab4c
(hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a)
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to hidden changeset 471f378eab4c
(hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a)
$ hg commit --amend -m "A2" $ hg commit --amend -m "A2"
2 new content-divergent changesets 2 new content-divergent changesets
$ hg log --hidden -G $ hg log --hidden -G
@ changeset: 3:65b757b745b9 @ changeset: 3:65b757b745b9
| tag: tip | tag: tip
| parent: 0:ea207398892e | parent: 0:ea207398892e
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: ROOT summary: ROOT
Check templates Check templates
--------------- ---------------
$ hg up 'desc(A0)' --hidden $ hg up 'desc(A0)' --hidden
updating to a hidden changeset 471f378eab4c
(hidden revision '471f378eab4c' has diverged)
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to hidden changeset 471f378eab4c
(hidden revision '471f378eab4c' has diverged)
Predecessors template should show current revision as it is the working copy Predecessors template should show current revision as it is the working copy
$ hg tlog $ hg tlog
* 019fadeab383 * 019fadeab383
| Predecessors: 1:471f378eab4c | Predecessors: 1:471f378eab4c
| semi-colon: 1:471f378eab4c | semi-colon: 1:471f378eab4c
| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: ROOT summary: ROOT
Check templates Check templates
--------------- ---------------
$ hg up 'desc(A0)' --hidden $ hg up 'desc(A0)' --hidden
updating to a hidden changeset 471f378eab4c
(hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
updated to hidden changeset 471f378eab4c
(hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
Predecessors template should show current revision as it is the working copy Predecessors template should show current revision as it is the working copy
$ hg tlog $ hg tlog
o eb5a0daa2192 o eb5a0daa2192
| Predecessors: 1:471f378eab4c | Predecessors: 1:471f378eab4c
| semi-colon: 1:471f378eab4c | semi-colon: 1:471f378eab4c
| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
| @ 471f378eab4c | @ 471f378eab4c
|/ Successors: 4:eb5a0daa2192 |/ Successors: 4:eb5a0daa2192
| multi-line: 4:eb5a0daa2192 | multi-line: 4:eb5a0daa2192
| json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
o ea207398892e o ea207398892e
$ hg fatelog $ hg fatelog
o eb5a0daa2192 o eb5a0daa2192
| |
| @ 471f378eab4c | @ 471f378eab4c
|/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
o ea207398892e o ea207398892e
$ hg up 'desc(B0)' --hidden $ hg up 'desc(B0)' --hidden
updating to a hidden changeset 0dec01379d3b
(hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to hidden changeset 0dec01379d3b
(hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
Predecessors template should both predecessors as they are visible Predecessors template should both predecessors as they are visible
$ hg tlog $ hg tlog
o eb5a0daa2192 o eb5a0daa2192
| Predecessors: 2:0dec01379d3b 1:471f378eab4c | Predecessors: 2:0dec01379d3b 1:471f378eab4c
| semi-colon: 2:0dec01379d3b; 1:471f378eab4c | semi-colon: 2:0dec01379d3b; 1:471f378eab4c
| json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"] | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"]
| map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874
| |
| @ 0dec01379d3b | @ 0dec01379d3b
| | Obsfate: rewritten using amend as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); | | Obsfate: rewritten using amend as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
| x 471f378eab4c | x 471f378eab4c
|/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
o ea207398892e o ea207398892e
$ hg up 'desc(B1)' --hidden $ hg up 'desc(B1)' --hidden
updating to a hidden changeset b7ea6d14e664
(hidden revision 'b7ea6d14e664' was rewritten as: eb5a0daa2192)
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to hidden changeset b7ea6d14e664
(hidden revision 'b7ea6d14e664' was rewritten as: eb5a0daa2192)
Predecessors template should both predecessors as they are visible Predecessors template should both predecessors as they are visible
$ hg tlog $ hg tlog
o eb5a0daa2192 o eb5a0daa2192
| Predecessors: 1:471f378eab4c 3:b7ea6d14e664 | Predecessors: 1:471f378eab4c 3:b7ea6d14e664
| semi-colon: 1:471f378eab4c; 3:b7ea6d14e664 | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664
| json: ["471f378eab4c5e25f6c77f785b27c936efb22874", "b7ea6d14e664bdc8922221f7992631b50da3fb07"] | json: ["471f378eab4c5e25f6c77f785b27c936efb22874", "b7ea6d14e664bdc8922221f7992631b50da3fb07"]
| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 3:b7ea6d14e664bdc8922221f7992631b50da3fb07 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 3:b7ea6d14e664bdc8922221f7992631b50da3fb07
$ hg fatelog $ hg fatelog
@ f897c6137566 @ f897c6137566
| |
o ea207398892e o ea207398892e
$ hg up -r "desc(B0)" --hidden $ hg up -r "desc(B0)" --hidden
updating to a hidden changeset 0dec01379d3b
(hidden revision '0dec01379d3b' is pruned)
2 files updated, 0 files merged, 1 files removed, 0 files unresolved 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
updated to hidden changeset 0dec01379d3b
(hidden revision '0dec01379d3b' is pruned)
$ hg tlog $ hg tlog
o f897c6137566 o f897c6137566
| Predecessors: 2:0dec01379d3b | Predecessors: 2:0dec01379d3b
| semi-colon: 2:0dec01379d3b | semi-colon: 2:0dec01379d3b
| json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
| map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
| @ 0dec01379d3b | @ 0dec01379d3b
| | Predecessors: 1:471f378eab4c | | Predecessors: 1:471f378eab4c
| |
| x 0dec01379d3b | x 0dec01379d3b
| | Obsfate: [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["f897c6137566320b081514b4c7227ecc3d384b39"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["f897c6137566320b081514b4c7227ecc3d384b39"]}, {"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["471f378eab4c5e25f6c77f785b27c936efb22874"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["471f378eab4c5e25f6c77f785b27c936efb22874"]}] | | Obsfate: [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["f897c6137566320b081514b4c7227ecc3d384b39"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["f897c6137566320b081514b4c7227ecc3d384b39"]}, {"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["471f378eab4c5e25f6c77f785b27c936efb22874"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["471f378eab4c5e25f6c77f785b27c936efb22874"]}]
| x 471f378eab4c | x 471f378eab4c
|/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]}] |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]}]
o ea207398892e o ea207398892e
$ hg up --hidden 4 $ hg up --hidden 4
updating to a hidden changeset 9bd10a0775e4
(hidden revision '9bd10a0775e4' has diverged)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to hidden changeset 9bd10a0775e4
(hidden revision '9bd10a0775e4' has diverged)
$ hg rebase -r 7 -d 8 --config extensions.rebase= $ hg rebase -r 7 -d 8 --config extensions.rebase=
rebasing 7:ba2ed02b0c9a "Add A,B,C" rebasing 7:ba2ed02b0c9a "Add A,B,C"
$ hg tlog $ hg tlog
* eceed8f98ffc * eceed8f98ffc
| Predecessors: 4:9bd10a0775e4 | Predecessors: 4:9bd10a0775e4
| semi-colon: 4:9bd10a0775e4 | semi-colon: 4:9bd10a0775e4
| json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
| map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
$ cd $TESTTMP/multiple-local-prune $ cd $TESTTMP/multiple-local-prune
$ mkcommit ROOT $ mkcommit ROOT
$ mkcommit A0 $ mkcommit A0
$ hg commit --amend -m "A1" $ hg commit --amend -m "A1"
$ hg debugobsolete --record-parent `getid "."` $ hg debugobsolete --record-parent `getid "."`
obsoleted 1 changesets obsoleted 1 changesets
$ hg up -r "desc(A0)" --hidden $ hg up -r "desc(A0)" --hidden
updating to a hidden changeset 471f378eab4c
(hidden revision '471f378eab4c' is pruned)
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to hidden changeset 471f378eab4c
(hidden revision '471f378eab4c' is pruned)
$ hg commit --amend -m "A2" $ hg commit --amend -m "A2"
$ hg debugobsolete --record-parent `getid "."` $ hg debugobsolete --record-parent `getid "."`
obsoleted 1 changesets obsoleted 1 changesets
Check output Check output
------------ ------------
$ hg up "desc(A0)" --hidden $ hg up "desc(A0)" --hidden
updating to a hidden changeset 471f378eab4c
(hidden revision '471f378eab4c' is pruned)
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to hidden changeset 471f378eab4c
(hidden revision '471f378eab4c' is pruned)
$ hg tlog $ hg tlog
@ 471f378eab4c @ 471f378eab4c
| |
o ea207398892e o ea207398892e
# todo: the obsfate output is not ideal # todo: the obsfate output is not ideal
$ hg fatelog $ hg fatelog
@ 471f378eab4c @ 471f378eab4c
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: ROOT summary: ROOT
Check templates Check templates
--------------- ---------------
$ hg up 'desc("A0")' --hidden $ hg up 'desc("A0")' --hidden
updating to a hidden changeset 471597cad322
(hidden revision '471597cad322' is pruned)
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to hidden changeset 471597cad322
(hidden revision '471597cad322' is pruned)
# todo: the obsfate output is not ideal # todo: the obsfate output is not ideal
$ hg fatelog $ hg fatelog
o 617adc3a144c o 617adc3a144c
| |
| @ 471597cad322 | @ 471597cad322
|/ Obsfate: pruned; |/ Obsfate: pruned;
o ea207398892e o ea207398892e
$ hg up -r 'desc("A2")' --hidden $ hg up -r 'desc("A2")' --hidden
updating to a hidden changeset 0d0ef4bdf70e
(hidden revision '0d0ef4bdf70e' is pruned)
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to hidden changeset 0d0ef4bdf70e
(hidden revision '0d0ef4bdf70e' is pruned)
$ hg fatelog --hidden $ hg fatelog --hidden
@ 0d0ef4bdf70e @ 0d0ef4bdf70e
| Obsfate: pruned by test (at 1970-01-01 00:00 +0000); | Obsfate: pruned by test (at 1970-01-01 00:00 +0000);
o 617adc3a144c o 617adc3a144c
| |
| x 471597cad322 | x 471597cad322
|/ Obsfate: split as 2:617adc3a144c, 3:0d0ef4bdf70e by test (at 1970-01-01 00:00 +0000); |/ Obsfate: split as 2:617adc3a144c, 3:0d0ef4bdf70e by test (at 1970-01-01 00:00 +0000);

tests/test-obsolete.t

97b7c2d76b1845ed3eb988cd612611e72406cef0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'babar'} 97b7c2d76b1845ed3eb988cd612611e72406cef0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'babar'}
(test that mercurial is not confused) (test that mercurial is not confused)
$ hg up null --quiet # having 0 as parent prevents it to be hidden $ hg up null --quiet # having 0 as parent prevents it to be hidden
$ hg tip $ hg tip
-1:000000000000 (public) [tip ] -1:000000000000 (public) [tip ]
$ hg up --hidden tip --quiet $ hg up --hidden tip --quiet
updating to a hidden changeset 97b7c2d76b18 updated to hidden changeset 97b7c2d76b18
(hidden revision '97b7c2d76b18' is pruned) (hidden revision '97b7c2d76b18' is pruned)
Killing a single changeset with itself should fail Killing a single changeset with itself should fail
(simple local safeguard) (simple local safeguard)
$ hg debugobsolete `getid kill_me` `getid kill_me` $ hg debugobsolete `getid kill_me` `getid kill_me`
abort: bad obsmarker input: in-marker cycle with 97b7c2d76b1845ed3eb988cd612611e72406cef0 abort: bad obsmarker input: in-marker cycle with 97b7c2d76b1845ed3eb988cd612611e72406cef0
[255] [255]

tests/test-rebase-obsolete.t

D D
Start rebase from a commit that is obsolete but not hidden only because it's Start rebase from a commit that is obsolete but not hidden only because it's
a working copy parent. We should be moved back to the starting commit as usual a working copy parent. We should be moved back to the starting commit as usual
even though it is hidden (until we're moved there). even though it is hidden (until we're moved there).
$ hg --hidden up -qr 'first(hidden())' $ hg --hidden up -qr 'first(hidden())'
updating to a hidden changeset 42ccdea3bb16 updated to hidden changeset 42ccdea3bb16
(hidden revision '42ccdea3bb16' is pruned) (hidden revision '42ccdea3bb16' is pruned)
$ hg rebase --rev 13 --dest 15 $ hg rebase --rev 13 --dest 15
rebasing 13:98f6af4ee953 "C" rebasing 13:98f6af4ee953 "C"
$ hg log -G $ hg log -G
o 16:294a2b93eb4d C o 16:294a2b93eb4d C
| |
o 15:627d46148090 D o 15:627d46148090 D
| |
o | 1:42ccdea3bb16 B o | 1:42ccdea3bb16 B
|/ |/
o 0:cd010b8cd998 A o 0:cd010b8cd998 A
Test hidden changesets in the rebase set (issue4504) Test hidden changesets in the rebase set (issue4504)
$ hg up --hidden 9 $ hg up --hidden 9
updating to a hidden changeset 4bde274eefcf
(hidden revision '4bde274eefcf' was rewritten as: acd174b7ab39)
3 files updated, 0 files merged, 1 files removed, 0 files unresolved 3 files updated, 0 files merged, 1 files removed, 0 files unresolved
updated to hidden changeset 4bde274eefcf
(hidden revision '4bde274eefcf' was rewritten as: acd174b7ab39)
$ echo J > J $ echo J > J
$ hg add J $ hg add J
$ hg commit -m J $ hg commit -m J
1 new orphan changesets 1 new orphan changesets
$ hg debugobsolete `hg log --rev . -T '{node}'` $ hg debugobsolete `hg log --rev . -T '{node}'`
obsoleted 1 changesets obsoleted 1 changesets
$ hg rebase --rev .~1::. --dest 'max(desc(D))' --traceback --config experimental.rebaseskipobsolete=off $ hg rebase --rev .~1::. --dest 'max(desc(D))' --traceback --config experimental.rebaseskipobsolete=off
$ hg add A $ hg add A
$ hg commit -m A $ hg commit -m A
$ echo B > B $ echo B > B
$ hg add B $ hg add B
$ hg commit -m B0 $ hg commit -m B0
$ hg commit --amend -m B1 $ hg commit --amend -m B1
$ hg commit --amend -m B2 $ hg commit --amend -m B2
$ hg up --hidden 'desc(B0)' $ hg up --hidden 'desc(B0)'
updating to a hidden changeset a8b11f55fb19
(hidden revision 'a8b11f55fb19' was rewritten as: 261e70097290)
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to hidden changeset a8b11f55fb19
(hidden revision 'a8b11f55fb19' was rewritten as: 261e70097290)
$ echo C > C $ echo C > C
$ hg add C $ hg add C
$ hg commit -m C $ hg commit -m C
1 new orphan changesets 1 new orphan changesets
$ hg log -G $ hg log -G
@ 4:212cb178bcbb C @ 4:212cb178bcbb C
| |
| o 3:261e70097290 B2 | o 3:261e70097290 B2
| | | |
x | 1:a8b11f55fb19 B0 (rewritten using amend as 3:261e70097290) x | 1:a8b11f55fb19 B0 (rewritten using amend as 3:261e70097290)
|/ |/
o 0:4a2df7238c3b A o 0:4a2df7238c3b A
Rebase finds its way in a chain of marker Rebase finds its way in a chain of marker
$ hg rebase -d 'desc(B2)' $ hg rebase -d 'desc(B2)'
note: not rebasing 1:a8b11f55fb19 "B0", already in destination as 3:261e70097290 "B2" note: not rebasing 1:a8b11f55fb19 "B0", already in destination as 3:261e70097290 "B2"
rebasing 4:212cb178bcbb "C" (tip) rebasing 4:212cb178bcbb "C" (tip)
Even when the chain include missing node Even when the chain include missing node
$ hg up --hidden 'desc(B0)' $ hg up --hidden 'desc(B0)'
updating to a hidden changeset a8b11f55fb19
(hidden revision 'a8b11f55fb19' was rewritten as: 261e70097290)
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
updated to hidden changeset a8b11f55fb19
(hidden revision 'a8b11f55fb19' was rewritten as: 261e70097290)
$ echo D > D $ echo D > D
$ hg add D $ hg add D
$ hg commit -m D $ hg commit -m D
1 new orphan changesets 1 new orphan changesets
$ hg --hidden strip -r 'desc(B1)' $ hg --hidden strip -r 'desc(B1)'
saved backup bundle to $TESTTMP/obsskip/.hg/strip-backup/86f6414ccda7-b1c452ee-backup.hg saved backup bundle to $TESTTMP/obsskip/.hg/strip-backup/86f6414ccda7-b1c452ee-backup.hg
1 new orphan changesets 1 new orphan changesets
$ hg log -G $ hg log -G
$ hg commit -m "john doe" $ hg commit -m "john doe"
created new head created new head
$ hg up 10 $ hg up 10
1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo "foo" > bar $ echo "foo" > bar
$ hg add bar $ hg add bar
$ hg commit --amend -m "10'" $ hg commit --amend -m "10'"
$ hg up 10 --hidden $ hg up 10 --hidden
updating to a hidden changeset 121d9e3bc4c6
(hidden revision '121d9e3bc4c6' was rewritten as: 77d874d096a2)
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
updated to hidden changeset 121d9e3bc4c6
(hidden revision '121d9e3bc4c6' was rewritten as: 77d874d096a2)
$ echo "bar" > foo $ echo "bar" > foo
$ hg add foo $ hg add foo
$ hg commit -m "bar foo" $ hg commit -m "bar foo"
1 new orphan changesets 1 new orphan changesets
$ hg log -G $ hg log -G
@ 14:73568ab6879d bar foo @ 14:73568ab6879d bar foo
| |
| o 13:77d874d096a2 10' | o 13:77d874d096a2 10'
> |/ # B/D=B > |/ # B/D=B
> A > A
> EOS > EOS
$ eval `hg tags -T '{tag}={node}\n'` $ eval `hg tags -T '{tag}={node}\n'`
$ rm .hg/localtags $ rm .hg/localtags
$ hg update -q $C --hidden $ hg update -q $C --hidden
updating to a hidden changeset 7829726be4dc updated to hidden changeset 7829726be4dc
(hidden revision '7829726be4dc' is pruned) (hidden revision '7829726be4dc' is pruned)
$ hg rebase -s $B -d $D $ hg rebase -s $B -d $D
rebasing 1:2ec65233581b "B" rebasing 1:2ec65233581b "B"
merging D merging D
warning: conflicts while merging D! (edit, then use 'hg resolve --mark') warning: conflicts while merging D! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue) unresolved conflicts (see hg resolve, then hg rebase --continue)
[1] [1]

tests/test-update-branches.t

$ hg up --quiet --hidden 3 $ hg up --quiet --hidden 3
$ hg up 5 $ hg up 5
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg book bm $ hg book bm
moving bookmark 'bm' forward from 6efa171f091b moving bookmark 'bm' forward from 6efa171f091b
$ hg bookmarks $ hg bookmarks
* bm 5:ff252e8273df * bm 5:ff252e8273df
Test that we abort before we warn about the hidden commit if the working
directory is dirty
$ echo conflict > a
$ hg up --hidden 3
abort: uncommitted changes
(commit or update --clean to discard changes)
[255]
Test that we still warn also when there are conflicts
$ hg up -m --hidden 3
merging a
warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges
(leaving bookmark bm)
updated to hidden changeset 6efa171f091b
(hidden revision '6efa171f091b' was rewritten as: d047485b3896)
[1]
$ hg revert -r . a
$ hg resolve -m
(no more unresolved files)
Test that 4 is detected as the no-argument destination from 3 and also moves Test that 4 is detected as the no-argument destination from 3 and also moves
the bookmark with it the bookmark with it
$ hg up --quiet 0 # we should be able to update to 3 directly $ hg up --quiet 0 # we should be able to update to 3 directly
$ hg up --quiet --hidden 3 # but not implemented yet. $ hg up --quiet --hidden 3 # but not implemented yet.
updating to a hidden changeset 6efa171f091b updated to hidden changeset 6efa171f091b
(hidden revision '6efa171f091b' was rewritten as: d047485b3896) (hidden revision '6efa171f091b' was rewritten as: d047485b3896)
$ hg book -f bm $ hg book -f bm
$ hg up $ hg up
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
updating bookmark bm updating bookmark bm
$ hg book $ hg book
* bm 4:d047485b3896 * bm 4:d047485b3896
Test that 5 is detected as a valid destination from 1 Test that 5 is detected as a valid destination from 1
$ hg up --quiet 0 # we should be able to update to 3 directly $ hg up --quiet 0 # we should be able to update to 3 directly
$ hg up --quiet --hidden 3 # but not implemented yet. $ hg up --quiet --hidden 3 # but not implemented yet.
updating to a hidden changeset 6efa171f091b updated to hidden changeset 6efa171f091b
(hidden revision '6efa171f091b' was rewritten as: d047485b3896) (hidden revision '6efa171f091b' was rewritten as: d047485b3896)
$ hg up 5 $ hg up 5
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Test that 5 is not detected as a valid destination from 2 Test that 5 is not detected as a valid destination from 2
$ hg up --quiet 0 $ hg up --quiet 0
$ hg up --quiet 2 $ hg up --quiet 2
$ hg up 5 $ hg up 5