| author | Gregory Szorc <gregory.szorc@gmail.com> |
| Mon, 20 Jan 2020 23:42:19 -0800 | |
| changeset 44117 | c5e0a9b97b8a |
| parent 42893 | 34a46d48d24e |
| child 45906 | 95c4cca641f6 |
| permissions | -rw-r--r-- |
|
35571
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1 |
This test file test the various messages when accessing obsolete |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2 |
revisions. |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
3 |
|
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
4 |
Global setup |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
5 |
============ |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
6 |
|
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
7 |
$ . $TESTDIR/testlib/obsmarker-common.sh |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
8 |
$ cat >> $HGRCPATH <<EOF |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
9 |
> [ui] |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
10 |
> interactive = true |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
11 |
> [phases] |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
12 |
> publish=False |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
13 |
> [experimental] |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
14 |
> evolution.createmarkers = yes |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
15 |
> evolution.effect-flags = yes |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
16 |
> EOF |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
17 |
|
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
18 |
Test output on amended commit |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
19 |
============================= |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
20 |
|
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
21 |
Test setup |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
22 |
---------- |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
23 |
|
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
24 |
$ hg init $TESTTMP/local-amend |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
25 |
$ cd $TESTTMP/local-amend |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
26 |
$ mkcommit ROOT |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
27 |
$ mkcommit A0 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
28 |
$ echo 42 >> A0 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
29 |
$ hg commit --amend -m "A1 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
30 |
> |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
31 |
> Better commit message" |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
32 |
$ hg log --hidden -G |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
33 |
@ changeset: 2:4ae3a4151de9 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
34 |
| tag: tip |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
35 |
| parent: 0:ea207398892e |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
36 |
| user: test |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
37 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
38 |
| summary: A1 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
39 |
| |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
40 |
| x changeset: 1:471f378eab4c |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
41 |
|/ user: test |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
42 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
43 |
| obsolete: rewritten using amend as 2:4ae3a4151de9 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
44 |
| summary: A0 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
45 |
| |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
46 |
o changeset: 0:ea207398892e |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
47 |
user: test |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
48 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
49 |
summary: ROOT |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
50 |
|
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
51 |
Actual test |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
52 |
----------- |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
53 |
$ hg update 471f378eab4c |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
54 |
abort: hidden revision '471f378eab4c' was rewritten as: 4ae3a4151de9! |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
55 |
(use --hidden to access hidden revisions) |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
56 |
[255] |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
57 |
$ hg update --hidden "desc(A0)" |
|
37920
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
35711
diff
changeset
|
58 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
35711
diff
changeset
|
59 |
updated to hidden changeset 471f378eab4c |
|
35711
35a0f6f31eef
update: display the obsfate of hidden revision we update to
Boris Feld <boris.feld@octobus.net>
parents:
35709
diff
changeset
|
60 |
(hidden revision '471f378eab4c' was rewritten as: 4ae3a4151de9) |
|
35571
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
61 |
|
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
62 |
Test output with pruned commit |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
63 |
============================== |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
64 |
|
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
65 |
Test setup |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
66 |
---------- |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
67 |
|
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
68 |
$ hg init $TESTTMP/local-prune |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
69 |
$ cd $TESTTMP/local-prune |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
70 |
$ mkcommit ROOT |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
71 |
$ mkcommit A0 # 0 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
72 |
$ mkcommit B0 # 1 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
73 |
$ hg log --hidden -G |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
74 |
@ changeset: 2:0dec01379d3b |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
75 |
| tag: tip |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
76 |
| user: test |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
77 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
78 |
| summary: B0 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
79 |
| |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
80 |
o changeset: 1:471f378eab4c |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
81 |
| user: test |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
82 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
83 |
| summary: A0 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
84 |
| |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
85 |
o changeset: 0:ea207398892e |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
86 |
user: test |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
87 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
88 |
summary: ROOT |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
89 |
|
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
90 |
$ hg debugobsolete --record-parents `getid 'desc(B0)'` |
|
42893
34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
37920
diff
changeset
|
91 |
1 new obsolescence markers |
|
35571
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
92 |
obsoleted 1 changesets |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
93 |
|
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
94 |
$ hg log --hidden -G |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
95 |
@ changeset: 2:0dec01379d3b |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
96 |
| tag: tip |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
97 |
| user: test |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
98 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
99 |
| obsolete: pruned |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
100 |
| summary: B0 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
101 |
| |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
102 |
o changeset: 1:471f378eab4c |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
103 |
| user: test |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
104 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
105 |
| summary: A0 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
106 |
| |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
107 |
o changeset: 0:ea207398892e |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
108 |
user: test |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
109 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
110 |
summary: ROOT |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
111 |
|
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
112 |
|
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
113 |
Actual test |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
114 |
----------- |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
115 |
$ hg up 1 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
116 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
117 |
$ hg up 0dec01379d3b |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
118 |
abort: hidden revision '0dec01379d3b' is pruned! |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
119 |
(use --hidden to access hidden revisions) |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
120 |
[255] |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
121 |
$ hg up --hidden -r 'desc(B0)' |
|
37920
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
35711
diff
changeset
|
122 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
35711
diff
changeset
|
123 |
updated to hidden changeset 0dec01379d3b |
|
35711
35a0f6f31eef
update: display the obsfate of hidden revision we update to
Boris Feld <boris.feld@octobus.net>
parents:
35709
diff
changeset
|
124 |
(hidden revision '0dec01379d3b' is pruned) |
|
35571
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
125 |
|
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
126 |
Test output with splitted commit |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
127 |
================================ |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
128 |
|
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
129 |
Test setup |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
130 |
---------- |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
131 |
|
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
132 |
$ hg init $TESTTMP/local-split |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
133 |
$ cd $TESTTMP/local-split |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
134 |
$ mkcommit ROOT |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
135 |
$ echo 42 >> a |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
136 |
$ echo 43 >> b |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
137 |
$ hg commit -A -m "A0" |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
138 |
adding a |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
139 |
adding b |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
140 |
$ hg log --hidden -G |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
141 |
@ changeset: 1:471597cad322 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
142 |
| tag: tip |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
143 |
| user: test |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
144 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
145 |
| summary: A0 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
146 |
| |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
147 |
o changeset: 0:ea207398892e |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
148 |
user: test |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
149 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
150 |
summary: ROOT |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
151 |
|
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
152 |
# Simulate a split |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
153 |
$ hg up 0 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
154 |
0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
155 |
|
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
156 |
$ echo 42 >> a |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
157 |
$ hg commit -A -m "A0" |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
158 |
adding a |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
159 |
created new head |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
160 |
|
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
161 |
$ echo 43 >> b |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
162 |
$ hg commit -A -m "A0" |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
163 |
adding b |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
164 |
|
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
165 |
$ hg debugobsolete `getid '1'` `getid '2'` `getid '3'` |
|
42893
34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
37920
diff
changeset
|
166 |
1 new obsolescence markers |
|
35571
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
167 |
obsoleted 1 changesets |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
168 |
|
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
169 |
$ hg log --hidden -G |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
170 |
@ changeset: 3:f257fde29c7a |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
171 |
| tag: tip |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
172 |
| user: test |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
173 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
174 |
| summary: A0 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
175 |
| |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
176 |
o changeset: 2:337fec4d2edc |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
177 |
| parent: 0:ea207398892e |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
178 |
| user: test |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
179 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
180 |
| summary: A0 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
181 |
| |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
182 |
| x changeset: 1:471597cad322 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
183 |
|/ user: test |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
184 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
185 |
| obsolete: split as 2:337fec4d2edc, 3:f257fde29c7a |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
186 |
| summary: A0 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
187 |
| |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
188 |
o changeset: 0:ea207398892e |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
189 |
user: test |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
190 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
191 |
summary: ROOT |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
192 |
|
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
193 |
Actual test |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
194 |
----------- |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
195 |
$ hg update 471597cad322 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
196 |
abort: hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a! |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
197 |
(use --hidden to access hidden revisions) |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
198 |
[255] |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
199 |
$ hg update --hidden 'min(desc(A0))' |
|
37920
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
35711
diff
changeset
|
200 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
35711
diff
changeset
|
201 |
updated to hidden changeset 471597cad322 |
|
35711
35a0f6f31eef
update: display the obsfate of hidden revision we update to
Boris Feld <boris.feld@octobus.net>
parents:
35709
diff
changeset
|
202 |
(hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a) |
|
35571
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
203 |
|
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
204 |
Test output with lots of splitted commit |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
205 |
======================================== |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
206 |
|
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
207 |
Test setup |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
208 |
---------- |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
209 |
|
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
210 |
$ hg init $TESTTMP/local-lots-split |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
211 |
$ cd $TESTTMP/local-lots-split |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
212 |
$ mkcommit ROOT |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
213 |
$ echo 42 >> a |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
214 |
$ echo 43 >> b |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
215 |
$ echo 44 >> c |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
216 |
$ echo 45 >> d |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
217 |
$ hg commit -A -m "A0" |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
218 |
adding a |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
219 |
adding b |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
220 |
adding c |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
221 |
adding d |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
222 |
$ hg log --hidden -G |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
223 |
@ changeset: 1:de7290d8b885 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
224 |
| tag: tip |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
225 |
| user: test |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
226 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
227 |
| summary: A0 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
228 |
| |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
229 |
o changeset: 0:ea207398892e |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
230 |
user: test |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
231 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
232 |
summary: ROOT |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
233 |
|
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
234 |
# Simulate a split |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
235 |
$ hg up 0 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
236 |
0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
237 |
|
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
238 |
$ echo 42 >> a |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
239 |
$ hg commit -A -m "A0" |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
240 |
adding a |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
241 |
created new head |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
242 |
|
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
243 |
$ echo 43 >> b |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
244 |
$ hg commit -A -m "A0" |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
245 |
adding b |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
246 |
|
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
247 |
$ echo 44 >> c |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
248 |
$ hg commit -A -m "A0" |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
249 |
adding c |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
250 |
|
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
251 |
$ echo 45 >> d |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
252 |
$ hg commit -A -m "A0" |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
253 |
adding d |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
254 |
|
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
255 |
$ hg debugobsolete `getid '1'` `getid '2'` `getid '3'` `getid '4'` `getid '5'` |
|
42893
34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
37920
diff
changeset
|
256 |
1 new obsolescence markers |
|
35571
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
257 |
obsoleted 1 changesets |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
258 |
|
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
259 |
$ hg log --hidden -G |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
260 |
@ changeset: 5:c7f044602e9b |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
261 |
| tag: tip |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
262 |
| user: test |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
263 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
264 |
| summary: A0 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
265 |
| |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
266 |
o changeset: 4:1ae8bc733a14 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
267 |
| user: test |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
268 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
269 |
| summary: A0 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
270 |
| |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
271 |
o changeset: 3:f257fde29c7a |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
272 |
| user: test |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
273 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
274 |
| summary: A0 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
275 |
| |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
276 |
o changeset: 2:337fec4d2edc |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
277 |
| parent: 0:ea207398892e |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
278 |
| user: test |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
279 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
280 |
| summary: A0 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
281 |
| |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
282 |
| x changeset: 1:de7290d8b885 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
283 |
|/ user: test |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
284 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
285 |
| obsolete: split as 2:337fec4d2edc, 3:f257fde29c7a, 4:1ae8bc733a14, 5:c7f044602e9b |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
286 |
| summary: A0 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
287 |
| |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
288 |
o changeset: 0:ea207398892e |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
289 |
user: test |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
290 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
291 |
summary: ROOT |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
292 |
|
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
293 |
Actual test |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
294 |
----------- |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
295 |
$ hg update de7290d8b885 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
296 |
abort: hidden revision 'de7290d8b885' was split as: 337fec4d2edc, f257fde29c7a and 2 more! |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
297 |
(use --hidden to access hidden revisions) |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
298 |
[255] |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
299 |
$ hg update --hidden 'min(desc(A0))' |
|
37920
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
35711
diff
changeset
|
300 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
35711
diff
changeset
|
301 |
updated to hidden changeset de7290d8b885 |
|
35711
35a0f6f31eef
update: display the obsfate of hidden revision we update to
Boris Feld <boris.feld@octobus.net>
parents:
35709
diff
changeset
|
302 |
(hidden revision 'de7290d8b885' was split as: 337fec4d2edc, f257fde29c7a and 2 more) |
|
35571
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
303 |
|
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
304 |
Test output with folded commit |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
305 |
============================== |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
306 |
|
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
307 |
Test setup |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
308 |
---------- |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
309 |
|
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
310 |
$ hg init $TESTTMP/local-fold |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
311 |
$ cd $TESTTMP/local-fold |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
312 |
$ mkcommit ROOT |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
313 |
$ mkcommit A0 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
314 |
$ mkcommit B0 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
315 |
$ hg log --hidden -G |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
316 |
@ changeset: 2:0dec01379d3b |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
317 |
| tag: tip |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
318 |
| user: test |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
319 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
320 |
| summary: B0 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
321 |
| |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
322 |
o changeset: 1:471f378eab4c |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
323 |
| user: test |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
324 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
325 |
| summary: A0 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
326 |
| |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
327 |
o changeset: 0:ea207398892e |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
328 |
user: test |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
329 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
330 |
summary: ROOT |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
331 |
|
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
332 |
# Simulate a fold |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
333 |
$ hg up 0 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
334 |
0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
335 |
$ echo "A0" > A0 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
336 |
$ echo "B0" > B0 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
337 |
$ hg add A0 B0 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
338 |
$ hg commit -m "C0" |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
339 |
created new head |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
340 |
|
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
341 |
$ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(C0)'` |
|
42893
34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
37920
diff
changeset
|
342 |
1 new obsolescence markers |
|
35571
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
343 |
obsoleted 1 changesets |
|
35709
1a09dad8b85a
evolution: report new unstable changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
35571
diff
changeset
|
344 |
1 new orphan changesets |
|
35571
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
345 |
$ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(C0)'` |
|
42893
34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
37920
diff
changeset
|
346 |
1 new obsolescence markers |
|
35571
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
347 |
obsoleted 1 changesets |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
348 |
|
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
349 |
$ hg log --hidden -G |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
350 |
@ changeset: 3:eb5a0daa2192 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
351 |
| tag: tip |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
352 |
| parent: 0:ea207398892e |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
353 |
| user: test |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
354 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
355 |
| summary: C0 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
356 |
| |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
357 |
| x changeset: 2:0dec01379d3b |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
358 |
| | user: test |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
359 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
360 |
| | obsolete: rewritten as 3:eb5a0daa2192 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
361 |
| | summary: B0 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
362 |
| | |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
363 |
| x changeset: 1:471f378eab4c |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
364 |
|/ user: test |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
365 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
366 |
| obsolete: rewritten as 3:eb5a0daa2192 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
367 |
| summary: A0 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
368 |
| |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
369 |
o changeset: 0:ea207398892e |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
370 |
user: test |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
371 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
372 |
summary: ROOT |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
373 |
|
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
374 |
Actual test |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
375 |
----------- |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
376 |
$ hg update 471f378eab4c |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
377 |
abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192! |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
378 |
(use --hidden to access hidden revisions) |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
379 |
[255] |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
380 |
$ hg update --hidden 'desc(A0)' |
|
37920
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
35711
diff
changeset
|
381 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
35711
diff
changeset
|
382 |
updated to hidden changeset 471f378eab4c |
|
35711
35a0f6f31eef
update: display the obsfate of hidden revision we update to
Boris Feld <boris.feld@octobus.net>
parents:
35709
diff
changeset
|
383 |
(hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192) |
|
35571
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
384 |
$ hg update 0dec01379d3b |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
385 |
abort: hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192! |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
386 |
(use --hidden to access hidden revisions) |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
387 |
[255] |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
388 |
$ hg update --hidden 'desc(B0)' |
|
37920
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
35711
diff
changeset
|
389 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
35711
diff
changeset
|
390 |
updated to hidden changeset 0dec01379d3b |
|
35711
35a0f6f31eef
update: display the obsfate of hidden revision we update to
Boris Feld <boris.feld@octobus.net>
parents:
35709
diff
changeset
|
391 |
(hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192) |
|
35571
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
392 |
|
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
393 |
Test output with divergence |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
394 |
=========================== |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
395 |
|
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
396 |
Test setup |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
397 |
---------- |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
398 |
|
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
399 |
$ hg init $TESTTMP/local-divergence |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
400 |
$ cd $TESTTMP/local-divergence |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
401 |
$ mkcommit ROOT |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
402 |
$ mkcommit A0 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
403 |
$ hg commit --amend -m "A1" |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
404 |
$ hg log --hidden -G |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
405 |
@ changeset: 2:fdf9bde5129a |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
406 |
| tag: tip |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
407 |
| parent: 0:ea207398892e |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
408 |
| user: test |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
409 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
410 |
| summary: A1 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
411 |
| |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
412 |
| x changeset: 1:471f378eab4c |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
413 |
|/ user: test |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
414 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
415 |
| obsolete: rewritten using amend as 2:fdf9bde5129a |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
416 |
| summary: A0 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
417 |
| |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
418 |
o changeset: 0:ea207398892e |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
419 |
user: test |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
420 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
421 |
summary: ROOT |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
422 |
|
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
423 |
$ hg update --hidden 'desc(A0)' |
|
37920
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
35711
diff
changeset
|
424 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
35711
diff
changeset
|
425 |
updated to hidden changeset 471f378eab4c |
|
35711
35a0f6f31eef
update: display the obsfate of hidden revision we update to
Boris Feld <boris.feld@octobus.net>
parents:
35709
diff
changeset
|
426 |
(hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a) |
|
35571
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
427 |
$ hg commit --amend -m "A2" |
|
35709
1a09dad8b85a
evolution: report new unstable changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
35571
diff
changeset
|
428 |
2 new content-divergent changesets |
|
35571
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
429 |
$ hg log --hidden -G |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
430 |
@ changeset: 3:65b757b745b9 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
431 |
| tag: tip |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
432 |
| parent: 0:ea207398892e |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
433 |
| user: test |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
434 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
435 |
| instability: content-divergent |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
436 |
| summary: A2 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
437 |
| |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
438 |
| * changeset: 2:fdf9bde5129a |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
439 |
|/ parent: 0:ea207398892e |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
440 |
| user: test |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
441 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
442 |
| instability: content-divergent |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
443 |
| summary: A1 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
444 |
| |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
445 |
| x changeset: 1:471f378eab4c |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
446 |
|/ user: test |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
447 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
448 |
| obsolete: rewritten using amend as 2:fdf9bde5129a |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
449 |
| obsolete: rewritten using amend as 3:65b757b745b9 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
450 |
| summary: A0 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
451 |
| |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
452 |
o changeset: 0:ea207398892e |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
453 |
user: test |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
454 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
455 |
summary: ROOT |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
456 |
|
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
457 |
Actual test |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
458 |
----------- |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
459 |
$ hg update 471f378eab4c |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
460 |
abort: hidden revision '471f378eab4c' has diverged! |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
461 |
(use --hidden to access hidden revisions) |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
462 |
[255] |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
463 |
$ hg update --hidden 'desc(A0)' |
|
37920
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
35711
diff
changeset
|
464 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
35711
diff
changeset
|
465 |
updated to hidden changeset 471f378eab4c |
|
35711
35a0f6f31eef
update: display the obsfate of hidden revision we update to
Boris Feld <boris.feld@octobus.net>
parents:
35709
diff
changeset
|
466 |
(hidden revision '471f378eab4c' has diverged) |
|
35571
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
467 |
|
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
468 |
Test output with amended + folded commit |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
469 |
======================================== |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
470 |
|
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
471 |
Test setup |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
472 |
---------- |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
473 |
|
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
474 |
$ hg init $TESTTMP/local-amend-fold |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
475 |
$ cd $TESTTMP/local-amend-fold |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
476 |
$ mkcommit ROOT |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
477 |
$ mkcommit A0 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
478 |
$ mkcommit B0 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
479 |
$ hg commit --amend -m "B1" |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
480 |
$ hg log --hidden -G |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
481 |
@ changeset: 3:b7ea6d14e664 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
482 |
| tag: tip |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
483 |
| parent: 1:471f378eab4c |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
484 |
| user: test |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
485 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
486 |
| summary: B1 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
487 |
| |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
488 |
| x changeset: 2:0dec01379d3b |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
489 |
|/ user: test |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
490 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
491 |
| obsolete: rewritten using amend as 3:b7ea6d14e664 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
492 |
| summary: B0 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
493 |
| |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
494 |
o changeset: 1:471f378eab4c |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
495 |
| user: test |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
496 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
497 |
| summary: A0 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
498 |
| |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
499 |
o changeset: 0:ea207398892e |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
500 |
user: test |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
501 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
502 |
summary: ROOT |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
503 |
|
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
504 |
|
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
505 |
# Simulate a fold |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
506 |
$ hg up 0 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
507 |
0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
508 |
$ echo "A0" > A0 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
509 |
$ echo "B0" > B0 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
510 |
$ hg add A0 B0 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
511 |
$ hg commit -m "C0" |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
512 |
created new head |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
513 |
|
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
514 |
$ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(C0)'` |
|
42893
34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
37920
diff
changeset
|
515 |
1 new obsolescence markers |
|
35571
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
516 |
obsoleted 1 changesets |
|
35709
1a09dad8b85a
evolution: report new unstable changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
35571
diff
changeset
|
517 |
1 new orphan changesets |
|
35571
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
518 |
$ hg debugobsolete `getid 'desc(B1)'` `getid 'desc(C0)'` |
|
42893
34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
37920
diff
changeset
|
519 |
1 new obsolescence markers |
|
35571
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
520 |
obsoleted 1 changesets |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
521 |
|
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
522 |
$ hg log --hidden -G |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
523 |
@ changeset: 4:eb5a0daa2192 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
524 |
| tag: tip |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
525 |
| parent: 0:ea207398892e |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
526 |
| user: test |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
527 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
528 |
| summary: C0 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
529 |
| |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
530 |
| x changeset: 3:b7ea6d14e664 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
531 |
| | parent: 1:471f378eab4c |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
532 |
| | user: test |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
533 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
534 |
| | obsolete: rewritten as 4:eb5a0daa2192 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
535 |
| | summary: B1 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
536 |
| | |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
537 |
| | x changeset: 2:0dec01379d3b |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
538 |
| |/ user: test |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
539 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
540 |
| | obsolete: rewritten using amend as 3:b7ea6d14e664 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
541 |
| | summary: B0 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
542 |
| | |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
543 |
| x changeset: 1:471f378eab4c |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
544 |
|/ user: test |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
545 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
546 |
| obsolete: rewritten as 4:eb5a0daa2192 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
547 |
| summary: A0 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
548 |
| |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
549 |
o changeset: 0:ea207398892e |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
550 |
user: test |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
551 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
552 |
summary: ROOT |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
553 |
|
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
554 |
Actual test |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
555 |
----------- |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
556 |
$ hg update 471f378eab4c |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
557 |
abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192! |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
558 |
(use --hidden to access hidden revisions) |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
559 |
[255] |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
560 |
$ hg update --hidden 'desc(A0)' |
|
37920
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
35711
diff
changeset
|
561 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
35711
diff
changeset
|
562 |
updated to hidden changeset 471f378eab4c |
|
35711
35a0f6f31eef
update: display the obsfate of hidden revision we update to
Boris Feld <boris.feld@octobus.net>
parents:
35709
diff
changeset
|
563 |
(hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192) |
|
35571
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
564 |
$ hg update --hidden 0dec01379d3b |
|
37920
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
35711
diff
changeset
|
565 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
35711
diff
changeset
|
566 |
updated to hidden changeset 0dec01379d3b |
|
35711
35a0f6f31eef
update: display the obsfate of hidden revision we update to
Boris Feld <boris.feld@octobus.net>
parents:
35709
diff
changeset
|
567 |
(hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192) |
|
35571
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
568 |
$ hg update 0dec01379d3b |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
569 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
570 |
$ hg update --hidden 'desc(B0)' |
|
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
571 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |