Mercurial > evolve
annotate tests/test-obsolete.t @ 2916:17749d9d3968
stack: move data computation on the object
We gather multiple data about the stack on the object. Let us move this on the
object and keep it cached there.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Mon, 04 Sep 2017 12:41:30 +0200 |
parents | 462adae9fea7 |
children | 06844693bb21 |
rev | line source |
---|---|
2384
2ddbdc1bab13
test: update test-obsolete.t to use common.sh
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
1 |
2ddbdc1bab13
test: update test-obsolete.t to use common.sh
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
2 $ . $TESTDIR/testlib/common.sh |
32
c27491be4431
obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
3 $ cat >> $HGRCPATH <<EOF |
c27491be4431
obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
4 > [web] |
c27491be4431
obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
5 > push_ssl = false |
c27491be4431
obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
6 > allow_push = * |
112
eae9be0ee00e
adapt obsolete to phase.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
98
diff
changeset
|
7 > [phases] |
eae9be0ee00e
adapt obsolete to phase.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
98
diff
changeset
|
8 > publish=False |
1060
f6e0cfca1bf0
test: work around a bug in debugobsolete
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1040
diff
changeset
|
9 > [alias] |
f6e0cfca1bf0
test: work around a bug in debugobsolete
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1040
diff
changeset
|
10 > debugobsolete=debugobsolete -d '0 0' |
32
c27491be4431
obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
11 > [extensions] |
491
6989d8fe4ed2
merge evolve and obsolete
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
486
diff
changeset
|
12 > hgext.rebase= |
32
c27491be4431
obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
13 > EOF |
1806
9f42f819267b
evolve: move the extensions to 'hgext3rd'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1780
diff
changeset
|
14 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH |
32
c27491be4431
obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
15 $ mkcommit() { |
c27491be4431
obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
16 > echo "$1" > "$1" |
c27491be4431
obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
17 > hg add "$1" |
c27491be4431
obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
18 > hg ci -m "add $1" |
c27491be4431
obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
19 > } |
49
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
20 $ alias qlog="hg log --template='{rev}\n- {node|short}\n'" |
39 | 21 $ hg init local |
22 $ cd local | |
32
c27491be4431
obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
23 $ mkcommit a # 0 |
135
1a08daef8a53
obsolete: add revset for various error case
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
112
diff
changeset
|
24 $ hg phase -p . |
32
c27491be4431
obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
25 $ mkcommit b # 1 |
c27491be4431
obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
26 $ mkcommit c # 2 |
c27491be4431
obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
27 $ hg up 1 |
c27491be4431
obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
28 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
c27491be4431
obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
29 $ mkcommit obsol_c # 3 |
c27491be4431
obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
30 created new head |
343 | 31 $ getid 2 |
32 4538525df7e2b9f09423636c61ef63a4cb872a2d | |
33 $ getid 3 | |
34 0d3f46688ccc6e756c7e96cf64c391c411309597 | |
35 $ hg debugobsolete 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 | |
2754
21f06d932231
test: update test output to match b11e8c67fb0f
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2710
diff
changeset
|
36 obsoleted 1 changesets |
343 | 37 $ hg debugobsolete |
2571
3f469be5f3a7
effectflag: activate effect flag on test-obsolete test file
Boris Feld <boris.feld@octobus.net>
parents:
2566
diff
changeset
|
38 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 (*) {'user': 'test'} (glob) |
343 | 39 |
39 | 40 |
398
42828b0ace98
obsolete: fix hidden() revset
Patrick Mezard <patrick@mezard.eu>
parents:
390
diff
changeset
|
41 Test hidden() revset |
42828b0ace98
obsolete: fix hidden() revset
Patrick Mezard <patrick@mezard.eu>
parents:
390
diff
changeset
|
42 |
42828b0ace98
obsolete: fix hidden() revset
Patrick Mezard <patrick@mezard.eu>
parents:
390
diff
changeset
|
43 $ qlog -r 'hidden()' --hidden |
42828b0ace98
obsolete: fix hidden() revset
Patrick Mezard <patrick@mezard.eu>
parents:
390
diff
changeset
|
44 2 |
42828b0ace98
obsolete: fix hidden() revset
Patrick Mezard <patrick@mezard.eu>
parents:
390
diff
changeset
|
45 - 4538525df7e2 |
39 | 46 |
47 Test that obsolete changeset are hidden | |
48 | |
45
d89453a10991
include hash in test.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
44
diff
changeset
|
49 $ qlog |
49
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
50 3 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
51 - 0d3f46688ccc |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
52 1 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
53 - 7c3bad9141dc |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
54 0 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
55 - 1f0dee641bb7 |
45
d89453a10991
include hash in test.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
44
diff
changeset
|
56 $ qlog --hidden |
49
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
57 3 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
58 - 0d3f46688ccc |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
59 2 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
60 - 4538525df7e2 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
61 1 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
62 - 7c3bad9141dc |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
63 0 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
64 - 1f0dee641bb7 |
45
d89453a10991
include hash in test.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
44
diff
changeset
|
65 $ qlog -r 'obsolete()' --hidden |
49
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
66 2 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
67 - 4538525df7e2 |
39 | 68 |
984
b286f77d680c
tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents:
957
diff
changeset
|
69 Test that obsolete precursors are properly computed |
143
0599fb01dc41
add an obsolete parent revset and related alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
136
diff
changeset
|
70 |
305
0b444d7c5c96
update revset vocabulary to use precursors, successors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
299
diff
changeset
|
71 $ qlog -r 'precursors(.)' --hidden |
143
0599fb01dc41
add an obsolete parent revset and related alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
136
diff
changeset
|
72 2 |
0599fb01dc41
add an obsolete parent revset and related alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
136
diff
changeset
|
73 - 4538525df7e2 |
0599fb01dc41
add an obsolete parent revset and related alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
136
diff
changeset
|
74 $ qlog -r . |
0599fb01dc41
add an obsolete parent revset and related alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
136
diff
changeset
|
75 3 |
0599fb01dc41
add an obsolete parent revset and related alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
136
diff
changeset
|
76 - 0d3f46688ccc |
0599fb01dc41
add an obsolete parent revset and related alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
136
diff
changeset
|
77 $ hg odiff |
0599fb01dc41
add an obsolete parent revset and related alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
136
diff
changeset
|
78 diff -r 4538525df7e2 -r 0d3f46688ccc c |
0599fb01dc41
add an obsolete parent revset and related alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
136
diff
changeset
|
79 --- a/c Thu Jan 01 00:00:00 1970 +0000 |
0599fb01dc41
add an obsolete parent revset and related alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
136
diff
changeset
|
80 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
0599fb01dc41
add an obsolete parent revset and related alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
136
diff
changeset
|
81 @@ -1,1 +0,0 @@ |
0599fb01dc41
add an obsolete parent revset and related alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
136
diff
changeset
|
82 -c |
0599fb01dc41
add an obsolete parent revset and related alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
136
diff
changeset
|
83 diff -r 4538525df7e2 -r 0d3f46688ccc obsol_c |
0599fb01dc41
add an obsolete parent revset and related alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
136
diff
changeset
|
84 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
0599fb01dc41
add an obsolete parent revset and related alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
136
diff
changeset
|
85 +++ b/obsol_c Thu Jan 01 00:00:00 1970 +0000 |
0599fb01dc41
add an obsolete parent revset and related alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
136
diff
changeset
|
86 @@ -0,0 +1,1 @@ |
0599fb01dc41
add an obsolete parent revset and related alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
136
diff
changeset
|
87 +obsol_c |
0599fb01dc41
add an obsolete parent revset and related alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
136
diff
changeset
|
88 |
984
b286f77d680c
tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents:
957
diff
changeset
|
89 Test that obsolete successors are properly computed |
306
8cfa3163dfaa
obsolete: add precursors and successors revset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
305
diff
changeset
|
90 |
8cfa3163dfaa
obsolete: add precursors and successors revset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
305
diff
changeset
|
91 $ qlog -r 'successors(2)' --hidden |
8cfa3163dfaa
obsolete: add precursors and successors revset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
305
diff
changeset
|
92 3 |
8cfa3163dfaa
obsolete: add precursors and successors revset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
305
diff
changeset
|
93 - 0d3f46688ccc |
8cfa3163dfaa
obsolete: add precursors and successors revset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
305
diff
changeset
|
94 |
984
b286f77d680c
tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents:
957
diff
changeset
|
95 test obsolete changeset with non-obsolete descendant |
40
b9a5a596d9ef
proper computation of hidden changeset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
39
diff
changeset
|
96 $ hg up 1 -q |
b9a5a596d9ef
proper computation of hidden changeset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
39
diff
changeset
|
97 $ mkcommit "obsol_c'" # 4 (on 1) |
b9a5a596d9ef
proper computation of hidden changeset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
39
diff
changeset
|
98 created new head |
343 | 99 $ hg debugobsolete `getid 3` `getid 4` |
2754
21f06d932231
test: update test output to match b11e8c67fb0f
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2710
diff
changeset
|
100 obsoleted 1 changesets |
45
d89453a10991
include hash in test.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
44
diff
changeset
|
101 $ qlog |
49
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
102 4 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
103 - 725c380fe99b |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
104 1 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
105 - 7c3bad9141dc |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
106 0 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
107 - 1f0dee641bb7 |
45
d89453a10991
include hash in test.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
44
diff
changeset
|
108 $ qlog -r 'obsolete()' --hidden |
49
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
109 2 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
110 - 4538525df7e2 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
111 3 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
112 - 0d3f46688ccc |
305
0b444d7c5c96
update revset vocabulary to use precursors, successors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
299
diff
changeset
|
113 $ qlog -r 'allprecursors(4)' --hidden |
144
f387658d6d22
Add a bosancestors revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
143
diff
changeset
|
114 2 |
f387658d6d22
Add a bosancestors revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
143
diff
changeset
|
115 - 4538525df7e2 |
f387658d6d22
Add a bosancestors revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
143
diff
changeset
|
116 3 |
f387658d6d22
Add a bosancestors revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
143
diff
changeset
|
117 - 0d3f46688ccc |
306
8cfa3163dfaa
obsolete: add precursors and successors revset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
305
diff
changeset
|
118 $ qlog -r 'allsuccessors(2)' --hidden |
8cfa3163dfaa
obsolete: add precursors and successors revset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
305
diff
changeset
|
119 3 |
8cfa3163dfaa
obsolete: add precursors and successors revset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
305
diff
changeset
|
120 - 0d3f46688ccc |
8cfa3163dfaa
obsolete: add precursors and successors revset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
305
diff
changeset
|
121 4 |
8cfa3163dfaa
obsolete: add precursors and successors revset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
305
diff
changeset
|
122 - 725c380fe99b |
625
e291e5271694
prepare for Full scale filtering !!!
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
594
diff
changeset
|
123 $ hg up --hidden 3 -q |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
1806
diff
changeset
|
124 working directory parent is obsolete! (0d3f46688ccc) |
745
99e51aff724b
add obsolete parents wrapper to the 'parents' command
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
743
diff
changeset
|
125 (reported by parents too) |
99e51aff724b
add obsolete parents wrapper to the 'parents' command
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
743
diff
changeset
|
126 $ hg parents |
99e51aff724b
add obsolete parents wrapper to the 'parents' command
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
743
diff
changeset
|
127 changeset: 3:0d3f46688ccc |
99e51aff724b
add obsolete parents wrapper to the 'parents' command
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
743
diff
changeset
|
128 parent: 1:7c3bad9141dc |
99e51aff724b
add obsolete parents wrapper to the 'parents' command
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
743
diff
changeset
|
129 user: test |
99e51aff724b
add obsolete parents wrapper to the 'parents' command
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
743
diff
changeset
|
130 date: Thu Jan 01 00:00:00 1970 +0000 |
2709
5d54de9cf50f
merge back with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2698
diff
changeset
|
131 obsolete: rewritten as 725c380fe99b |
745
99e51aff724b
add obsolete parents wrapper to the 'parents' command
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
743
diff
changeset
|
132 summary: add obsol_c |
99e51aff724b
add obsolete parents wrapper to the 'parents' command
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
743
diff
changeset
|
133 |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
1806
diff
changeset
|
134 working directory parent is obsolete! (0d3f46688ccc) |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
1806
diff
changeset
|
135 (use 'hg evolve' to update to its successor: 725c380fe99b) |
40
b9a5a596d9ef
proper computation of hidden changeset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
39
diff
changeset
|
136 $ mkcommit d # 5 (on 3) |
2854
66796d7b5415
warning: rename unstable warning message
Boris Feld <boris.feld@octobus.net>
parents:
2844
diff
changeset
|
137 1 new orphan changesets |
45
d89453a10991
include hash in test.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
44
diff
changeset
|
138 $ qlog -r 'obsolete()' |
49
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
139 3 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
140 - 0d3f46688ccc |
40
b9a5a596d9ef
proper computation of hidden changeset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
39
diff
changeset
|
141 |
136
915728be8afd
add test for revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
135
diff
changeset
|
142 $ qlog -r 'extinct()' --hidden |
915728be8afd
add test for revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
135
diff
changeset
|
143 2 |
915728be8afd
add test for revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
135
diff
changeset
|
144 - 4538525df7e2 |
915728be8afd
add test for revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
135
diff
changeset
|
145 $ qlog -r 'suspended()' |
915728be8afd
add test for revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
135
diff
changeset
|
146 3 |
915728be8afd
add test for revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
135
diff
changeset
|
147 - 0d3f46688ccc |
2842
2b8b960a04ee
revset: unstable() is deprecated
Boris Feld <boris.feld@octobus.net>
parents:
2836
diff
changeset
|
148 $ qlog -r "orphan()" |
136
915728be8afd
add test for revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
135
diff
changeset
|
149 5 |
915728be8afd
add test for revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
135
diff
changeset
|
150 - a7a6f2b5d8a5 |
915728be8afd
add test for revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
135
diff
changeset
|
151 |
299
eda6491ca269
obsolete: add 'obsolete' keyword
Patrick Mezard <patrick@mezard.eu>
parents:
280
diff
changeset
|
152 Test obsolete keyword |
eda6491ca269
obsolete: add 'obsolete' keyword
Patrick Mezard <patrick@mezard.eu>
parents:
280
diff
changeset
|
153 |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1621
diff
changeset
|
154 $ hg --hidden log -G \ |
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1621
diff
changeset
|
155 > --template '{rev}:{node|short}@{branch}({separate("/", obsolete, phase)}) {desc|firstline}\n' |
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1621
diff
changeset
|
156 @ 5:a7a6f2b5d8a5@default(draft) add d |
299
eda6491ca269
obsolete: add 'obsolete' keyword
Patrick Mezard <patrick@mezard.eu>
parents:
280
diff
changeset
|
157 | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1621
diff
changeset
|
158 | o 4:725c380fe99b@default(draft) add obsol_c' |
299
eda6491ca269
obsolete: add 'obsolete' keyword
Patrick Mezard <patrick@mezard.eu>
parents:
280
diff
changeset
|
159 | | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1621
diff
changeset
|
160 x | 3:0d3f46688ccc@default(obsolete/draft) add obsol_c |
299
eda6491ca269
obsolete: add 'obsolete' keyword
Patrick Mezard <patrick@mezard.eu>
parents:
280
diff
changeset
|
161 |/ |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1621
diff
changeset
|
162 | x 2:4538525df7e2@default(obsolete/draft) add c |
299
eda6491ca269
obsolete: add 'obsolete' keyword
Patrick Mezard <patrick@mezard.eu>
parents:
280
diff
changeset
|
163 |/ |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1621
diff
changeset
|
164 o 1:7c3bad9141dc@default(draft) add b |
299
eda6491ca269
obsolete: add 'obsolete' keyword
Patrick Mezard <patrick@mezard.eu>
parents:
280
diff
changeset
|
165 | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1621
diff
changeset
|
166 o 0:1f0dee641bb7@default(public) add a |
299
eda6491ca269
obsolete: add 'obsolete' keyword
Patrick Mezard <patrick@mezard.eu>
parents:
280
diff
changeset
|
167 |
eda6491ca269
obsolete: add 'obsolete' keyword
Patrick Mezard <patrick@mezard.eu>
parents:
280
diff
changeset
|
168 |
44
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
169 Test communication of obsolete relation with a compatible client |
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
170 |
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
171 $ hg init ../other-new |
135
1a08daef8a53
obsolete: add revset for various error case
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
112
diff
changeset
|
172 $ hg phase --draft 'secret() - extinct()' # until we fix exclusion |
385
cdcdedc532b7
obsolete: Stop turning obsolete secret changesets secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
381
diff
changeset
|
173 abort: empty revision set |
cdcdedc532b7
obsolete: Stop turning obsolete secret changesets secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
381
diff
changeset
|
174 [255] |
217
786eb34d93ea
obsolete: refuse to push unstable changeset without -f
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
215
diff
changeset
|
175 $ hg push ../other-new |
786eb34d93ea
obsolete: refuse to push unstable changeset without -f
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
215
diff
changeset
|
176 pushing to ../other-new |
786eb34d93ea
obsolete: refuse to push unstable changeset without -f
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
215
diff
changeset
|
177 searching for changes |
2834
38db1466c6fb
log: unstable was renamed into orphan
Boris Feld <boris.feld@octobus.net>
parents:
2833
diff
changeset
|
178 abort: push includes orphan changeset: a7a6f2b5d8a5! |
492
7ecd41520dae
rename `stabilize` to `evolve`
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
491
diff
changeset
|
179 (use 'hg evolve' to get a stable history or --force to ignore warnings) |
217
786eb34d93ea
obsolete: refuse to push unstable changeset without -f
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
215
diff
changeset
|
180 [255] |
786eb34d93ea
obsolete: refuse to push unstable changeset without -f
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
215
diff
changeset
|
181 $ hg push -f ../other-new |
44
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
182 pushing to ../other-new |
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
183 searching for changes |
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
184 adding changesets |
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
185 adding manifests |
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
186 adding file changes |
46
3b0364fc822f
Do not propagate obsolete changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
45
diff
changeset
|
187 added 5 changesets with 5 changes to 5 files (+1 heads) |
1453
8ca31deb8db7
merge with stable
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1452
diff
changeset
|
188 2 new obsolescence markers |
215
0eceb5a48485
obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
214
diff
changeset
|
189 $ hg -R ../other-new verify |
0eceb5a48485
obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
214
diff
changeset
|
190 checking changesets |
0eceb5a48485
obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
214
diff
changeset
|
191 checking manifests |
0eceb5a48485
obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
214
diff
changeset
|
192 crosschecking files in changesets and manifests |
0eceb5a48485
obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
214
diff
changeset
|
193 checking files |
0eceb5a48485
obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
214
diff
changeset
|
194 5 files, 5 changesets, 5 total revisions |
45
d89453a10991
include hash in test.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
44
diff
changeset
|
195 $ qlog -R ../other-new -r 'obsolete()' |
49
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
196 2 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
197 - 0d3f46688ccc |
45
d89453a10991
include hash in test.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
44
diff
changeset
|
198 $ qlog -R ../other-new |
49
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
199 4 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
200 - a7a6f2b5d8a5 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
201 3 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
202 - 725c380fe99b |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
203 2 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
204 - 0d3f46688ccc |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
205 1 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
206 - 7c3bad9141dc |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
207 0 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
208 - 1f0dee641bb7 |
625
e291e5271694
prepare for Full scale filtering !!!
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
594
diff
changeset
|
209 $ hg up --hidden 3 -q |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
1806
diff
changeset
|
210 working directory parent is obsolete! (0d3f46688ccc) |
44
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
211 $ mkcommit obsol_d # 6 |
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
212 created new head |
2854
66796d7b5415
warning: rename unstable warning message
Boris Feld <boris.feld@octobus.net>
parents:
2844
diff
changeset
|
213 1 new orphan changesets |
343 | 214 $ hg debugobsolete `getid 5` `getid 6` |
2754
21f06d932231
test: update test output to match b11e8c67fb0f
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2710
diff
changeset
|
215 obsoleted 1 changesets |
44
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
216 $ qlog |
49
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
217 6 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
218 - 95de7fc6918d |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
219 4 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
220 - 725c380fe99b |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
221 3 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
222 - 0d3f46688ccc |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
223 1 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
224 - 7c3bad9141dc |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
225 0 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
226 - 1f0dee641bb7 |
44
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
227 $ qlog -r 'obsolete()' |
49
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
228 3 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
229 - 0d3f46688ccc |
217
786eb34d93ea
obsolete: refuse to push unstable changeset without -f
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
215
diff
changeset
|
230 $ hg push ../other-new |
786eb34d93ea
obsolete: refuse to push unstable changeset without -f
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
215
diff
changeset
|
231 pushing to ../other-new |
786eb34d93ea
obsolete: refuse to push unstable changeset without -f
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
215
diff
changeset
|
232 searching for changes |
2834
38db1466c6fb
log: unstable was renamed into orphan
Boris Feld <boris.feld@octobus.net>
parents:
2833
diff
changeset
|
233 abort: push includes orphan changeset: 95de7fc6918d! |
492
7ecd41520dae
rename `stabilize` to `evolve`
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
491
diff
changeset
|
234 (use 'hg evolve' to get a stable history or --force to ignore warnings) |
217
786eb34d93ea
obsolete: refuse to push unstable changeset without -f
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
215
diff
changeset
|
235 [255] |
786eb34d93ea
obsolete: refuse to push unstable changeset without -f
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
215
diff
changeset
|
236 $ hg push ../other-new -f # use f because there is unstability |
44
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
237 pushing to ../other-new |
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
238 searching for changes |
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
239 adding changesets |
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
240 adding manifests |
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
241 adding file changes |
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
242 added 1 changesets with 1 changes to 1 files (+1 heads) |
1453
8ca31deb8db7
merge with stable
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1452
diff
changeset
|
243 1 new obsolescence markers |
2710
e22de367fc74
compat: adapt to change in 53b3a1968aa6-core
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2709
diff
changeset
|
244 obsoleted 1 changesets |
44
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
245 $ qlog -R ../other-new |
49
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
246 5 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
247 - 95de7fc6918d |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
248 3 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
249 - 725c380fe99b |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
250 2 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
251 - 0d3f46688ccc |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
252 1 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
253 - 7c3bad9141dc |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
254 0 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
255 - 1f0dee641bb7 |
44
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
256 $ qlog -R ../other-new -r 'obsolete()' |
49
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
257 2 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
258 - 0d3f46688ccc |
214
a140d1857931
obsolete: do not warn about unpushed extinct changeset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
206
diff
changeset
|
259 |
984
b286f77d680c
tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents:
957
diff
changeset
|
260 Pushing again does not advertise extinct changesets |
214
a140d1857931
obsolete: do not warn about unpushed extinct changeset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
206
diff
changeset
|
261 |
a140d1857931
obsolete: do not warn about unpushed extinct changeset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
206
diff
changeset
|
262 $ hg push ../other-new |
a140d1857931
obsolete: do not warn about unpushed extinct changeset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
206
diff
changeset
|
263 pushing to ../other-new |
a140d1857931
obsolete: do not warn about unpushed extinct changeset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
206
diff
changeset
|
264 searching for changes |
385
cdcdedc532b7
obsolete: Stop turning obsolete secret changesets secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
381
diff
changeset
|
265 no changes found |
214
a140d1857931
obsolete: do not warn about unpushed extinct changeset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
206
diff
changeset
|
266 [1] |
a140d1857931
obsolete: do not warn about unpushed extinct changeset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
206
diff
changeset
|
267 |
625
e291e5271694
prepare for Full scale filtering !!!
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
594
diff
changeset
|
268 $ hg up --hidden -q .^ # 3 |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
1806
diff
changeset
|
269 working directory parent is obsolete! (0d3f46688ccc) |
44
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
270 $ mkcommit "obsol_d'" # 7 |
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
271 created new head |
2854
66796d7b5415
warning: rename unstable warning message
Boris Feld <boris.feld@octobus.net>
parents:
2844
diff
changeset
|
272 1 new orphan changesets |
343 | 273 $ hg debugobsolete `getid 6` `getid 7` |
2754
21f06d932231
test: update test output to match b11e8c67fb0f
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2710
diff
changeset
|
274 obsoleted 1 changesets |
44
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
275 $ hg pull -R ../other-new . |
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
276 pulling from . |
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
277 searching for changes |
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
278 adding changesets |
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
279 adding manifests |
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
280 adding file changes |
633
3d5bed04ee4c
test: adapt to the way the bundle is generated
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
594
diff
changeset
|
281 added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) |
1453
8ca31deb8db7
merge with stable
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1452
diff
changeset
|
282 1 new obsolescence markers |
2710
e22de367fc74
compat: adapt to change in 53b3a1968aa6-core
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2709
diff
changeset
|
283 obsoleted 1 changesets |
2398
612c17c8ab69
tests: apply output changes from core fix
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2384
diff
changeset
|
284 (run 'hg heads' to see heads, 'hg merge' to merge) |
44
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
285 $ qlog -R ../other-new |
135
1a08daef8a53
obsolete: add revset for various error case
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
112
diff
changeset
|
286 6 |
49
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
287 - 909a0fb57e5d |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
288 3 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
289 - 725c380fe99b |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
290 2 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
291 - 0d3f46688ccc |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
292 1 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
293 - 7c3bad9141dc |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
294 0 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
295 - 1f0dee641bb7 |
46
3b0364fc822f
Do not propagate obsolete changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
45
diff
changeset
|
296 |
984
b286f77d680c
tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents:
957
diff
changeset
|
297 pushing to stuff that doesn't support obsolescence |
46
3b0364fc822f
Do not propagate obsolete changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
45
diff
changeset
|
298 |
984
b286f77d680c
tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents:
957
diff
changeset
|
299 DISABLED. the _enable switch is global :-/ |
405
b5b1bf5166a2
obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
398
diff
changeset
|
300 |
b5b1bf5166a2
obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
398
diff
changeset
|
301 .. $ hg init ../other-old |
b5b1bf5166a2
obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
398
diff
changeset
|
302 .. > # XXX I don't like this but changeset get published otherwise |
b5b1bf5166a2
obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
398
diff
changeset
|
303 .. > # remove it when we will get a --keep-state flag for push |
b5b1bf5166a2
obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
398
diff
changeset
|
304 .. $ echo '[extensions]' > ../other-old/.hg/hgrc |
b5b1bf5166a2
obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
398
diff
changeset
|
305 .. $ echo "obsolete=!$(echo $(dirname $TESTDIR))/obsolete.py" >> ../other-old/.hg/hgrc |
b5b1bf5166a2
obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
398
diff
changeset
|
306 .. $ hg push ../other-old |
b5b1bf5166a2
obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
398
diff
changeset
|
307 .. pushing to ../other-old |
b5b1bf5166a2
obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
398
diff
changeset
|
308 .. searching for changes |
b5b1bf5166a2
obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
398
diff
changeset
|
309 .. abort: push includes an unstable changeset: 909a0fb57e5d! |
492
7ecd41520dae
rename `stabilize` to `evolve`
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
491
diff
changeset
|
310 .. (use 'hg evolve' to get a stable history or --force to ignore warnings) |
405
b5b1bf5166a2
obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
398
diff
changeset
|
311 .. [255] |
b5b1bf5166a2
obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
398
diff
changeset
|
312 .. $ hg push -f ../other-old |
b5b1bf5166a2
obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
398
diff
changeset
|
313 .. pushing to ../other-old |
b5b1bf5166a2
obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
398
diff
changeset
|
314 .. searching for changes |
b5b1bf5166a2
obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
398
diff
changeset
|
315 .. adding changesets |
b5b1bf5166a2
obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
398
diff
changeset
|
316 .. adding manifests |
b5b1bf5166a2
obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
398
diff
changeset
|
317 .. adding file changes |
b5b1bf5166a2
obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
398
diff
changeset
|
318 .. added 5 changesets with 5 changes to 5 files (+1 heads) |
b5b1bf5166a2
obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
398
diff
changeset
|
319 .. $ qlog -R ../other-ol |
b5b1bf5166a2
obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
398
diff
changeset
|
320 .. 4 |
b5b1bf5166a2
obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
398
diff
changeset
|
321 .. - 909a0fb57e5d |
b5b1bf5166a2
obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
398
diff
changeset
|
322 .. 3 |
b5b1bf5166a2
obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
398
diff
changeset
|
323 .. - 725c380fe99b |
b5b1bf5166a2
obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
398
diff
changeset
|
324 .. 2 |
b5b1bf5166a2
obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
398
diff
changeset
|
325 .. - 0d3f46688ccc |
b5b1bf5166a2
obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
398
diff
changeset
|
326 .. 1 |
b5b1bf5166a2
obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
398
diff
changeset
|
327 .. - 7c3bad9141dc |
b5b1bf5166a2
obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
398
diff
changeset
|
328 .. 0 |
b5b1bf5166a2
obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
398
diff
changeset
|
329 .. - 1f0dee641bb7 |
44
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
330 |
50
19b22ad56b32
clone support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
49
diff
changeset
|
331 clone support |
44
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
332 |
50
19b22ad56b32
clone support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
49
diff
changeset
|
333 $ hg clone . ../cloned |
75
d7b11772f0b5
[obsolete] published changeset can't be obsoleted
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
52
diff
changeset
|
334 > # The warning should go away once we have default value to set ready before we pull |
50
19b22ad56b32
clone support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
49
diff
changeset
|
335 updating to branch default |
19b22ad56b32
clone support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
49
diff
changeset
|
336 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
44
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
337 |
389
cb575242d2ba
test-obsolete: handle local clones copying obsolete markers
Patrick Mezard <patrick@mezard.eu>
parents:
385
diff
changeset
|
338 $ qlog -R ../cloned --hidden |
385
cdcdedc532b7
obsolete: Stop turning obsolete secret changesets secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
381
diff
changeset
|
339 7 |
cdcdedc532b7
obsolete: Stop turning obsolete secret changesets secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
381
diff
changeset
|
340 - 909a0fb57e5d |
cdcdedc532b7
obsolete: Stop turning obsolete secret changesets secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
381
diff
changeset
|
341 6 |
cdcdedc532b7
obsolete: Stop turning obsolete secret changesets secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
381
diff
changeset
|
342 - 95de7fc6918d |
cdcdedc532b7
obsolete: Stop turning obsolete secret changesets secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
381
diff
changeset
|
343 5 |
cdcdedc532b7
obsolete: Stop turning obsolete secret changesets secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
381
diff
changeset
|
344 - a7a6f2b5d8a5 |
135
1a08daef8a53
obsolete: add revset for various error case
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
112
diff
changeset
|
345 4 |
385
cdcdedc532b7
obsolete: Stop turning obsolete secret changesets secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
381
diff
changeset
|
346 - 725c380fe99b |
135
1a08daef8a53
obsolete: add revset for various error case
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
112
diff
changeset
|
347 3 |
385
cdcdedc532b7
obsolete: Stop turning obsolete secret changesets secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
381
diff
changeset
|
348 - 0d3f46688ccc |
135
1a08daef8a53
obsolete: add revset for various error case
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
112
diff
changeset
|
349 2 |
385
cdcdedc532b7
obsolete: Stop turning obsolete secret changesets secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
381
diff
changeset
|
350 - 4538525df7e2 |
50
19b22ad56b32
clone support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
49
diff
changeset
|
351 1 |
19b22ad56b32
clone support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
49
diff
changeset
|
352 - 7c3bad9141dc |
19b22ad56b32
clone support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
49
diff
changeset
|
353 0 |
19b22ad56b32
clone support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
49
diff
changeset
|
354 - 1f0dee641bb7 |
19b22ad56b32
clone support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
49
diff
changeset
|
355 |
52
62bdc2567099
Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
51
diff
changeset
|
356 Test rollback support |
62bdc2567099
Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
51
diff
changeset
|
357 |
625
e291e5271694
prepare for Full scale filtering !!!
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
594
diff
changeset
|
358 $ hg up --hidden .^ -q # 3 |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
1806
diff
changeset
|
359 working directory parent is obsolete! (0d3f46688ccc) |
52
62bdc2567099
Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
51
diff
changeset
|
360 $ mkcommit "obsol_d''" |
62bdc2567099
Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
51
diff
changeset
|
361 created new head |
2854
66796d7b5415
warning: rename unstable warning message
Boris Feld <boris.feld@octobus.net>
parents:
2844
diff
changeset
|
362 1 new orphan changesets |
343 | 363 $ hg debugobsolete `getid 7` `getid 8` |
2754
21f06d932231
test: update test output to match b11e8c67fb0f
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2710
diff
changeset
|
364 obsoleted 1 changesets |
215
0eceb5a48485
obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
214
diff
changeset
|
365 $ cd ../other-new |
0eceb5a48485
obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
214
diff
changeset
|
366 $ hg up -q 3 |
0eceb5a48485
obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
214
diff
changeset
|
367 $ hg pull ../local/ |
0eceb5a48485
obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
214
diff
changeset
|
368 pulling from ../local/ |
52
62bdc2567099
Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
51
diff
changeset
|
369 searching for changes |
62bdc2567099
Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
51
diff
changeset
|
370 adding changesets |
62bdc2567099
Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
51
diff
changeset
|
371 adding manifests |
62bdc2567099
Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
51
diff
changeset
|
372 adding file changes |
633
3d5bed04ee4c
test: adapt to the way the bundle is generated
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
594
diff
changeset
|
373 added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) |
1453
8ca31deb8db7
merge with stable
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1452
diff
changeset
|
374 1 new obsolescence markers |
2710
e22de367fc74
compat: adapt to change in 53b3a1968aa6-core
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2709
diff
changeset
|
375 obsoleted 1 changesets |
2398
612c17c8ab69
tests: apply output changes from core fix
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2384
diff
changeset
|
376 (run 'hg heads' to see heads, 'hg merge' to merge) |
52
62bdc2567099
Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
51
diff
changeset
|
377 |
215
0eceb5a48485
obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
214
diff
changeset
|
378 $ hg up -q 7 # to check rollback update behavior |
0eceb5a48485
obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
214
diff
changeset
|
379 $ qlog |
135
1a08daef8a53
obsolete: add revset for various error case
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
112
diff
changeset
|
380 7 |
52
62bdc2567099
Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
51
diff
changeset
|
381 - 159dfc9fa5d3 |
62bdc2567099
Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
51
diff
changeset
|
382 3 |
62bdc2567099
Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
51
diff
changeset
|
383 - 725c380fe99b |
62bdc2567099
Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
51
diff
changeset
|
384 2 |
62bdc2567099
Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
51
diff
changeset
|
385 - 0d3f46688ccc |
62bdc2567099
Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
51
diff
changeset
|
386 1 |
62bdc2567099
Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
51
diff
changeset
|
387 - 7c3bad9141dc |
62bdc2567099
Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
51
diff
changeset
|
388 0 |
62bdc2567099
Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
51
diff
changeset
|
389 - 1f0dee641bb7 |
215
0eceb5a48485
obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
214
diff
changeset
|
390 $ hg rollback |
135
1a08daef8a53
obsolete: add revset for various error case
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
112
diff
changeset
|
391 repository tip rolled back to revision 6 (undo pull) |
215
0eceb5a48485
obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
214
diff
changeset
|
392 working directory now based on revision 3 |
0eceb5a48485
obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
214
diff
changeset
|
393 $ hg summary |
0eceb5a48485
obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
214
diff
changeset
|
394 parent: 3:725c380fe99b |
0eceb5a48485
obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
214
diff
changeset
|
395 add obsol_c' |
0eceb5a48485
obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
214
diff
changeset
|
396 branch: default |
0eceb5a48485
obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
214
diff
changeset
|
397 commit: 1 deleted, 2 unknown (clean) |
625
e291e5271694
prepare for Full scale filtering !!!
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
594
diff
changeset
|
398 update: 2 new changesets, 2 branch heads (merge) |
1453
8ca31deb8db7
merge with stable
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1452
diff
changeset
|
399 phases: 4 draft |
2834
38db1466c6fb
log: unstable was renamed into orphan
Boris Feld <boris.feld@octobus.net>
parents:
2833
diff
changeset
|
400 orphan: 1 changesets |
215
0eceb5a48485
obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
214
diff
changeset
|
401 $ qlog |
135
1a08daef8a53
obsolete: add revset for various error case
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
112
diff
changeset
|
402 6 |
52
62bdc2567099
Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
51
diff
changeset
|
403 - 909a0fb57e5d |
62bdc2567099
Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
51
diff
changeset
|
404 3 |
62bdc2567099
Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
51
diff
changeset
|
405 - 725c380fe99b |
62bdc2567099
Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
51
diff
changeset
|
406 2 |
62bdc2567099
Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
51
diff
changeset
|
407 - 0d3f46688ccc |
62bdc2567099
Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
51
diff
changeset
|
408 1 |
62bdc2567099
Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
51
diff
changeset
|
409 - 7c3bad9141dc |
62bdc2567099
Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
51
diff
changeset
|
410 0 |
62bdc2567099
Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
51
diff
changeset
|
411 - 1f0dee641bb7 |
215
0eceb5a48485
obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
214
diff
changeset
|
412 $ cd ../local |
52
62bdc2567099
Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
51
diff
changeset
|
413 |
112
eae9be0ee00e
adapt obsolete to phase.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
98
diff
changeset
|
414 obsolete public changeset |
eae9be0ee00e
adapt obsolete to phase.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
98
diff
changeset
|
415 |
eae9be0ee00e
adapt obsolete to phase.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
98
diff
changeset
|
416 # move draft boundary from 0 to 1 |
eae9be0ee00e
adapt obsolete to phase.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
98
diff
changeset
|
417 $ sed -e 's/1f0dee641bb7258c56bd60e93edfa2405381c41e/7c3bad9141dcb46ff89abf5f61856facd56e476c/' -i'.back' .hg/store/phaseroots |
75
d7b11772f0b5
[obsolete] published changeset can't be obsoleted
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
52
diff
changeset
|
418 |
d7b11772f0b5
[obsolete] published changeset can't be obsoleted
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
52
diff
changeset
|
419 $ hg up null |
d7b11772f0b5
[obsolete] published changeset can't be obsoleted
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
52
diff
changeset
|
420 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
80
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
421 $ mkcommit toto # 9 |
75
d7b11772f0b5
[obsolete] published changeset can't be obsoleted
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
52
diff
changeset
|
422 created new head |
80
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
423 $ hg id -n |
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
424 9 |
343 | 425 $ hg debugobsolete `getid 0` `getid 9` |
426 83b5778897ad try to obsolete immutable changeset 1f0dee641bb7 | |
427 # at core level the warning is not issued | |
593
26f76b38f879
evolve: Rename latecomer into bumped
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
587
diff
changeset
|
428 # this is now a big issue now that we have bumped warning |
75
d7b11772f0b5
[obsolete] published changeset can't be obsoleted
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
52
diff
changeset
|
429 $ qlog -r 'obsolete()' |
d7b11772f0b5
[obsolete] published changeset can't be obsoleted
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
52
diff
changeset
|
430 3 |
d7b11772f0b5
[obsolete] published changeset can't be obsoleted
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
52
diff
changeset
|
431 - 0d3f46688ccc |
80
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
432 allow to just kill changeset |
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
433 |
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
434 $ qlog |
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
435 9 |
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
436 - 83b5778897ad |
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
437 8 |
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
438 - 159dfc9fa5d3 |
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
439 4 |
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
440 - 725c380fe99b |
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
441 3 |
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
442 - 0d3f46688ccc |
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
443 1 |
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
444 - 7c3bad9141dc |
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
445 0 |
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
446 - 1f0dee641bb7 |
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
447 |
343 | 448 $ hg debugobsolete `getid 9` #kill |
2754
21f06d932231
test: update test output to match b11e8c67fb0f
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2710
diff
changeset
|
449 obsoleted 1 changesets |
80
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
450 $ hg up null -q # to be not based on 9 anymore |
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
451 $ qlog |
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
452 8 |
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
453 - 159dfc9fa5d3 |
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
454 4 |
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
455 - 725c380fe99b |
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
456 3 |
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
457 - 0d3f46688ccc |
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
458 1 |
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
459 - 7c3bad9141dc |
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
460 0 |
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
461 - 1f0dee641bb7 |
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
462 |
984
b286f77d680c
tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents:
957
diff
changeset
|
463 Check that auto update ignores hidden changeset |
473
1f8f8dd75d18
obsolete: prevent bare hg update to select hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
471
diff
changeset
|
464 $ hg up 0 |
1f8f8dd75d18
obsolete: prevent bare hg update to select hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
471
diff
changeset
|
465 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1f8f8dd75d18
obsolete: prevent bare hg update to select hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
471
diff
changeset
|
466 $ hg up |
1f8f8dd75d18
obsolete: prevent bare hg update to select hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
471
diff
changeset
|
467 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2709
5d54de9cf50f
merge back with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2698
diff
changeset
|
468 updated to "159dfc9fa5d3: add obsol_d''" |
1616
c216b175d535
tests: add head warning messages
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1493
diff
changeset
|
469 1 other heads for branch "default" |
473
1f8f8dd75d18
obsolete: prevent bare hg update to select hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
471
diff
changeset
|
470 $ hg id -n |
1f8f8dd75d18
obsolete: prevent bare hg update to select hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
471
diff
changeset
|
471 8 |
1f8f8dd75d18
obsolete: prevent bare hg update to select hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
471
diff
changeset
|
472 |
984
b286f77d680c
tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents:
957
diff
changeset
|
473 Check that named update does too |
480
cd1d5b7308be
obsolete: ignore hidden changeset when resolving `branchname` revision
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
479
diff
changeset
|
474 |
cd1d5b7308be
obsolete: ignore hidden changeset when resolving `branchname` revision
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
479
diff
changeset
|
475 $ hg update default |
cd1d5b7308be
obsolete: ignore hidden changeset when resolving `branchname` revision
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
479
diff
changeset
|
476 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
cd1d5b7308be
obsolete: ignore hidden changeset when resolving `branchname` revision
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
479
diff
changeset
|
477 $ hg id -n |
cd1d5b7308be
obsolete: ignore hidden changeset when resolving `branchname` revision
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
479
diff
changeset
|
478 8 |
cd1d5b7308be
obsolete: ignore hidden changeset when resolving `branchname` revision
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
479
diff
changeset
|
479 |
473
1f8f8dd75d18
obsolete: prevent bare hg update to select hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
471
diff
changeset
|
480 $ hg up null -q # to be not based on 9 anymore |
1f8f8dd75d18
obsolete: prevent bare hg update to select hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
471
diff
changeset
|
481 |
150
f12fd2410a60
obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
144
diff
changeset
|
482 check rebase compat |
f12fd2410a60
obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
144
diff
changeset
|
483 |
572
dc107acd0bd2
adapt to core rebase support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
571
diff
changeset
|
484 $ hg log -G --template='{rev} - {node|short} {desc}\n' |
dc107acd0bd2
adapt to core rebase support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
571
diff
changeset
|
485 o 8 - 159dfc9fa5d3 add obsol_d'' |
150
f12fd2410a60
obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
144
diff
changeset
|
486 | |
572
dc107acd0bd2
adapt to core rebase support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
571
diff
changeset
|
487 | o 4 - 725c380fe99b add obsol_c' |
150
f12fd2410a60
obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
144
diff
changeset
|
488 | | |
572
dc107acd0bd2
adapt to core rebase support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
571
diff
changeset
|
489 x | 3 - 0d3f46688ccc add obsol_c |
150
f12fd2410a60
obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
144
diff
changeset
|
490 |/ |
572
dc107acd0bd2
adapt to core rebase support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
571
diff
changeset
|
491 o 1 - 7c3bad9141dc add b |
150
f12fd2410a60
obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
144
diff
changeset
|
492 | |
572
dc107acd0bd2
adapt to core rebase support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
571
diff
changeset
|
493 o 0 - 1f0dee641bb7 add a |
150
f12fd2410a60
obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
144
diff
changeset
|
494 |
f12fd2410a60
obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
144
diff
changeset
|
495 |
990
c863269aed01
test-obsolete: make log templates more consistent: add {desc} to one
Greg Ward <greg@gerg.ca>
parents:
989
diff
changeset
|
496 $ hg log -G --template='{rev} - {node|short} {desc}\n' --hidden |
c863269aed01
test-obsolete: make log templates more consistent: add {desc} to one
Greg Ward <greg@gerg.ca>
parents:
989
diff
changeset
|
497 x 9 - 83b5778897ad add toto |
150
f12fd2410a60
obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
144
diff
changeset
|
498 |
990
c863269aed01
test-obsolete: make log templates more consistent: add {desc} to one
Greg Ward <greg@gerg.ca>
parents:
989
diff
changeset
|
499 o 8 - 159dfc9fa5d3 add obsol_d'' |
150
f12fd2410a60
obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
144
diff
changeset
|
500 | |
990
c863269aed01
test-obsolete: make log templates more consistent: add {desc} to one
Greg Ward <greg@gerg.ca>
parents:
989
diff
changeset
|
501 | x 7 - 909a0fb57e5d add obsol_d' |
150
f12fd2410a60
obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
144
diff
changeset
|
502 |/ |
990
c863269aed01
test-obsolete: make log templates more consistent: add {desc} to one
Greg Ward <greg@gerg.ca>
parents:
989
diff
changeset
|
503 | x 6 - 95de7fc6918d add obsol_d |
150
f12fd2410a60
obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
144
diff
changeset
|
504 |/ |
990
c863269aed01
test-obsolete: make log templates more consistent: add {desc} to one
Greg Ward <greg@gerg.ca>
parents:
989
diff
changeset
|
505 | x 5 - a7a6f2b5d8a5 add d |
150
f12fd2410a60
obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
144
diff
changeset
|
506 |/ |
990
c863269aed01
test-obsolete: make log templates more consistent: add {desc} to one
Greg Ward <greg@gerg.ca>
parents:
989
diff
changeset
|
507 | o 4 - 725c380fe99b add obsol_c' |
150
f12fd2410a60
obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
144
diff
changeset
|
508 | | |
990
c863269aed01
test-obsolete: make log templates more consistent: add {desc} to one
Greg Ward <greg@gerg.ca>
parents:
989
diff
changeset
|
509 x | 3 - 0d3f46688ccc add obsol_c |
150
f12fd2410a60
obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
144
diff
changeset
|
510 |/ |
990
c863269aed01
test-obsolete: make log templates more consistent: add {desc} to one
Greg Ward <greg@gerg.ca>
parents:
989
diff
changeset
|
511 | x 2 - 4538525df7e2 add c |
150
f12fd2410a60
obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
144
diff
changeset
|
512 |/ |
990
c863269aed01
test-obsolete: make log templates more consistent: add {desc} to one
Greg Ward <greg@gerg.ca>
parents:
989
diff
changeset
|
513 o 1 - 7c3bad9141dc add b |
150
f12fd2410a60
obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
144
diff
changeset
|
514 | |
990
c863269aed01
test-obsolete: make log templates more consistent: add {desc} to one
Greg Ward <greg@gerg.ca>
parents:
989
diff
changeset
|
515 o 0 - 1f0dee641bb7 add a |
150
f12fd2410a60
obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
144
diff
changeset
|
516 |
f12fd2410a60
obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
144
diff
changeset
|
517 |
984
b286f77d680c
tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents:
957
diff
changeset
|
518 should not rebase extinct changesets |
150
f12fd2410a60
obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
144
diff
changeset
|
519 |
572
dc107acd0bd2
adapt to core rebase support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
571
diff
changeset
|
520 #excluded 'whole rebase set is extinct and ignored.' message not in core |
1621
05d15886aaeb
test: explicitly disable rebaseskipobsolete in a couple of place (issue5135)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1616
diff
changeset
|
521 $ hg rebase -b '3' -d 4 --traceback --config experimental.rebaseskipobsolete=0 |
1188
0c879e986ce4
test: adapt to core change in graft and rebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1130
diff
changeset
|
522 rebasing 3:0d3f46688ccc "add obsol_c" |
0c879e986ce4
test: adapt to core change in graft and rebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1130
diff
changeset
|
523 rebasing 8:159dfc9fa5d3 "add obsol_d''" (tip) |
2858
4b934144ed11
messages: use hyphenated '{phase,content}-divergent' in user messages
Martin von Zweigbergk <martinvonz@google.com>
parents:
2856
diff
changeset
|
524 2 new content-divergent changesets |
989
33096d7d094b
test-obsolete: explicitly show which changesets are divergent
Greg Ward <greg@gerg.ca>
parents:
984
diff
changeset
|
525 $ hg --hidden log -q -r 'successors(3)' |
33096d7d094b
test-obsolete: explicitly show which changesets are divergent
Greg Ward <greg@gerg.ca>
parents:
984
diff
changeset
|
526 4:725c380fe99b |
33096d7d094b
test-obsolete: explicitly show which changesets are divergent
Greg Ward <greg@gerg.ca>
parents:
984
diff
changeset
|
527 10:2033b4e49474 |
747
9300f48786de
test: prepare test for core changeset 9c78ed396075
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
745
diff
changeset
|
528 $ hg up tip |
9300f48786de
test: prepare test for core changeset 9c78ed396075
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
745
diff
changeset
|
529 ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) |
572
dc107acd0bd2
adapt to core rebase support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
571
diff
changeset
|
530 $ hg log -G --template='{rev} - {node|short} {desc}\n' |
dc107acd0bd2
adapt to core rebase support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
571
diff
changeset
|
531 @ 11 - 9468a5f5d8b2 add obsol_d'' |
150
f12fd2410a60
obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
144
diff
changeset
|
532 | |
572
dc107acd0bd2
adapt to core rebase support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
571
diff
changeset
|
533 o 10 - 2033b4e49474 add obsol_c |
150
f12fd2410a60
obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
144
diff
changeset
|
534 | |
572
dc107acd0bd2
adapt to core rebase support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
571
diff
changeset
|
535 o 4 - 725c380fe99b add obsol_c' |
150
f12fd2410a60
obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
144
diff
changeset
|
536 | |
572
dc107acd0bd2
adapt to core rebase support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
571
diff
changeset
|
537 o 1 - 7c3bad9141dc add b |
150
f12fd2410a60
obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
144
diff
changeset
|
538 | |
572
dc107acd0bd2
adapt to core rebase support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
571
diff
changeset
|
539 o 0 - 1f0dee641bb7 add a |
150
f12fd2410a60
obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
144
diff
changeset
|
540 |
f12fd2410a60
obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
144
diff
changeset
|
541 |
218
ace5608350b6
obsolete: do no complain when push create a new head but obsolete an old one.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
217
diff
changeset
|
542 Does not complain about new head if you obsolete the old one |
984
b286f77d680c
tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents:
957
diff
changeset
|
543 (re necessary when we start running discovery on unfiltered repo in core) |
218
ace5608350b6
obsolete: do no complain when push create a new head but obsolete an old one.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
217
diff
changeset
|
544 |
ace5608350b6
obsolete: do no complain when push create a new head but obsolete an old one.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
217
diff
changeset
|
545 $ hg push ../other-new --traceback |
ace5608350b6
obsolete: do no complain when push create a new head but obsolete an old one.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
217
diff
changeset
|
546 pushing to ../other-new |
ace5608350b6
obsolete: do no complain when push create a new head but obsolete an old one.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
217
diff
changeset
|
547 searching for changes |
ace5608350b6
obsolete: do no complain when push create a new head but obsolete an old one.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
217
diff
changeset
|
548 adding changesets |
ace5608350b6
obsolete: do no complain when push create a new head but obsolete an old one.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
217
diff
changeset
|
549 adding manifests |
ace5608350b6
obsolete: do no complain when push create a new head but obsolete an old one.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
217
diff
changeset
|
550 adding file changes |
756
64c6bdfd0518
evolve: use super for calling parent class method
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
750
diff
changeset
|
551 added 2 changesets with 1 changes to [12] files (re) |
1453
8ca31deb8db7
merge with stable
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1452
diff
changeset
|
552 3 new obsolescence markers |
2710
e22de367fc74
compat: adapt to change in 53b3a1968aa6-core
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2709
diff
changeset
|
553 obsoleted 1 changesets |
218
ace5608350b6
obsolete: do no complain when push create a new head but obsolete an old one.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
217
diff
changeset
|
554 $ hg up -q 10 |
ace5608350b6
obsolete: do no complain when push create a new head but obsolete an old one.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
217
diff
changeset
|
555 $ mkcommit "obsol_d'''" |
ace5608350b6
obsolete: do no complain when push create a new head but obsolete an old one.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
217
diff
changeset
|
556 created new head |
343 | 557 $ hg debugobsolete `getid 11` `getid 12` |
2754
21f06d932231
test: update test output to match b11e8c67fb0f
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2710
diff
changeset
|
558 obsoleted 1 changesets |
218
ace5608350b6
obsolete: do no complain when push create a new head but obsolete an old one.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
217
diff
changeset
|
559 $ hg push ../other-new --traceback |
ace5608350b6
obsolete: do no complain when push create a new head but obsolete an old one.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
217
diff
changeset
|
560 pushing to ../other-new |
ace5608350b6
obsolete: do no complain when push create a new head but obsolete an old one.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
217
diff
changeset
|
561 searching for changes |
ace5608350b6
obsolete: do no complain when push create a new head but obsolete an old one.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
217
diff
changeset
|
562 adding changesets |
ace5608350b6
obsolete: do no complain when push create a new head but obsolete an old one.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
217
diff
changeset
|
563 adding manifests |
ace5608350b6
obsolete: do no complain when push create a new head but obsolete an old one.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
217
diff
changeset
|
564 adding file changes |
ace5608350b6
obsolete: do no complain when push create a new head but obsolete an old one.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
217
diff
changeset
|
565 added 1 changesets with 1 changes to 1 files (+1 heads) |
1453
8ca31deb8db7
merge with stable
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1452
diff
changeset
|
566 1 new obsolescence markers |
2710
e22de367fc74
compat: adapt to change in 53b3a1968aa6-core
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2709
diff
changeset
|
567 obsoleted 1 changesets |
274
6622a24f3b0f
obsolete: fix rebase wrapping
Patrick Mezard <patrick@mezard.eu>
parents:
225
diff
changeset
|
568 $ cd .. |
307
9ac56d36d6ff
obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
306
diff
changeset
|
569 |
593
26f76b38f879
evolve: Rename latecomer into bumped
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
587
diff
changeset
|
570 check bumped detection |
307
9ac56d36d6ff
obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
306
diff
changeset
|
571 (make an obsolete changeset public) |
9ac56d36d6ff
obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
306
diff
changeset
|
572 |
9ac56d36d6ff
obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
306
diff
changeset
|
573 $ cd local |
625
e291e5271694
prepare for Full scale filtering !!!
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
594
diff
changeset
|
574 $ hg phase --hidden --public 11 |
2858
4b934144ed11
messages: use hyphenated '{phase,content}-divergent' in user messages
Martin von Zweigbergk <martinvonz@google.com>
parents:
2856
diff
changeset
|
575 1 new phase-divergent changesets |
570
1c45a07dda51
test-obsolete: clean up useless inlined option
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
554
diff
changeset
|
576 $ hg log -G --template='{rev} - ({phase}) {node|short} {desc}\n' |
307
9ac56d36d6ff
obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
306
diff
changeset
|
577 @ 12 - (draft) 6db5e282cb91 add obsol_d''' |
9ac56d36d6ff
obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
306
diff
changeset
|
578 | |
9ac56d36d6ff
obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
306
diff
changeset
|
579 | o 11 - (public) 9468a5f5d8b2 add obsol_d'' |
9ac56d36d6ff
obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
306
diff
changeset
|
580 |/ |
9ac56d36d6ff
obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
306
diff
changeset
|
581 o 10 - (public) 2033b4e49474 add obsol_c |
9ac56d36d6ff
obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
306
diff
changeset
|
582 | |
9ac56d36d6ff
obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
306
diff
changeset
|
583 o 4 - (public) 725c380fe99b add obsol_c' |
9ac56d36d6ff
obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
306
diff
changeset
|
584 | |
9ac56d36d6ff
obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
306
diff
changeset
|
585 o 1 - (public) 7c3bad9141dc add b |
9ac56d36d6ff
obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
306
diff
changeset
|
586 | |
9ac56d36d6ff
obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
306
diff
changeset
|
587 o 0 - (public) 1f0dee641bb7 add a |
9ac56d36d6ff
obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
306
diff
changeset
|
588 |
2844
9688988472da
revset: bumped() is deprecated
Boris Feld <boris.feld@octobus.net>
parents:
2843
diff
changeset
|
589 $ hg log -r 'phasedivergent()' |
307
9ac56d36d6ff
obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
306
diff
changeset
|
590 changeset: 12:6db5e282cb91 |
9ac56d36d6ff
obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
306
diff
changeset
|
591 tag: tip |
9ac56d36d6ff
obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
306
diff
changeset
|
592 parent: 10:2033b4e49474 |
9ac56d36d6ff
obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
306
diff
changeset
|
593 user: test |
9ac56d36d6ff
obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
306
diff
changeset
|
594 date: Thu Jan 01 00:00:00 1970 +0000 |
2836
feaa52680682
log: bumped was renamed into phasedivergent
Boris Feld <boris.feld@octobus.net>
parents:
2835
diff
changeset
|
595 instability: phase-divergent |
307
9ac56d36d6ff
obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
306
diff
changeset
|
596 summary: add obsol_d''' |
9ac56d36d6ff
obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
306
diff
changeset
|
597 |
308
23ef1c71d164
obsolete: detect late comer during push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
307
diff
changeset
|
598 $ hg push ../other-new/ |
23ef1c71d164
obsolete: detect late comer during push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
307
diff
changeset
|
599 pushing to ../other-new/ |
23ef1c71d164
obsolete: detect late comer during push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
307
diff
changeset
|
600 searching for changes |
2836
feaa52680682
log: bumped was renamed into phasedivergent
Boris Feld <boris.feld@octobus.net>
parents:
2835
diff
changeset
|
601 abort: push includes phase-divergent changeset: 6db5e282cb91! |
492
7ecd41520dae
rename `stabilize` to `evolve`
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
491
diff
changeset
|
602 (use 'hg evolve' to get a stable history or --force to ignore warnings) |
308
23ef1c71d164
obsolete: detect late comer during push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
307
diff
changeset
|
603 [255] |
320
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
604 |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
605 Check hg commit --amend compat |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
606 |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
607 $ hg up 'desc(obsol_c)' |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
608 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
609 $ mkcommit f |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
610 created new head |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
611 $ echo 42 >> f |
554
39eb12bb47c0
commit --amend: adap to core 63e45aee46d4
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
612 $ hg commit --amend --traceback --quiet |
570
1c45a07dda51
test-obsolete: clean up useless inlined option
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
554
diff
changeset
|
613 $ hg log -G |
590
02cadd3dc9f4
evolve: adapt to 2.4 code
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
587
diff
changeset
|
614 @ changeset: 15:705ab2a6b72e |
320
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
615 | tag: tip |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
616 | parent: 10:2033b4e49474 |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
617 | user: test |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
618 | date: Thu Jan 01 00:00:00 1970 +0000 |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
619 | summary: add f |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
620 | |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
621 | o changeset: 12:6db5e282cb91 |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
622 |/ parent: 10:2033b4e49474 |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
623 | user: test |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
624 | date: Thu Jan 01 00:00:00 1970 +0000 |
2836
feaa52680682
log: bumped was renamed into phasedivergent
Boris Feld <boris.feld@octobus.net>
parents:
2835
diff
changeset
|
625 | instability: phase-divergent |
320
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
626 | summary: add obsol_d''' |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
627 | |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
628 | o changeset: 11:9468a5f5d8b2 |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
629 |/ user: test |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
630 | date: Thu Jan 01 00:00:00 1970 +0000 |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
631 | summary: add obsol_d'' |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
632 | |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
633 o changeset: 10:2033b4e49474 |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
634 | parent: 4:725c380fe99b |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
635 | user: test |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
636 | date: Thu Jan 01 00:00:00 1970 +0000 |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
637 | summary: add obsol_c |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
638 | |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
639 o changeset: 4:725c380fe99b |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
640 | parent: 1:7c3bad9141dc |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
641 | user: test |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
642 | date: Thu Jan 01 00:00:00 1970 +0000 |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
643 | summary: add obsol_c' |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
644 | |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
645 o changeset: 1:7c3bad9141dc |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
646 | user: test |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
647 | date: Thu Jan 01 00:00:00 1970 +0000 |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
648 | summary: add b |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
649 | |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
650 o changeset: 0:1f0dee641bb7 |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
651 user: test |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
652 date: Thu Jan 01 00:00:00 1970 +0000 |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
653 summary: add a |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
654 |
554
39eb12bb47c0
commit --amend: adap to core 63e45aee46d4
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
655 $ hg debugobsolete | grep -v 33d458d86621f3186c40bfccd77652f4a122743e |
2571
3f469be5f3a7
effectflag: activate effect flag on test-obsolete test file
Boris Feld <boris.feld@octobus.net>
parents:
2566
diff
changeset
|
656 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 (*) {'user': 'test'} (glob) |
3f469be5f3a7
effectflag: activate effect flag on test-obsolete test file
Boris Feld <boris.feld@octobus.net>
parents:
2566
diff
changeset
|
657 0d3f46688ccc6e756c7e96cf64c391c411309597 725c380fe99b5e76613493f0903e8d11ddc70d54 0 (*) {'user': 'test'} (glob) |
3f469be5f3a7
effectflag: activate effect flag on test-obsolete test file
Boris Feld <boris.feld@octobus.net>
parents:
2566
diff
changeset
|
658 a7a6f2b5d8a54b81bc7aa2fba2934ad6d700a79e 95de7fc6918dea4c9c8d5382f50649794b474c4a 0 (*) {'user': 'test'} (glob) |
3f469be5f3a7
effectflag: activate effect flag on test-obsolete test file
Boris Feld <boris.feld@octobus.net>
parents:
2566
diff
changeset
|
659 95de7fc6918dea4c9c8d5382f50649794b474c4a 909a0fb57e5d909f353d89e394ffd7e0890fec88 0 (*) {'user': 'test'} (glob) |
3f469be5f3a7
effectflag: activate effect flag on test-obsolete test file
Boris Feld <boris.feld@octobus.net>
parents:
2566
diff
changeset
|
660 909a0fb57e5d909f353d89e394ffd7e0890fec88 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 0 (*) {'user': 'test'} (glob) |
3f469be5f3a7
effectflag: activate effect flag on test-obsolete test file
Boris Feld <boris.feld@octobus.net>
parents:
2566
diff
changeset
|
661 1f0dee641bb7258c56bd60e93edfa2405381c41e 83b5778897adafb967ef2f75be3aaa4fce49a4cc 0 (*) {'user': 'test'} (glob) |
3f469be5f3a7
effectflag: activate effect flag on test-obsolete test file
Boris Feld <boris.feld@octobus.net>
parents:
2566
diff
changeset
|
662 83b5778897adafb967ef2f75be3aaa4fce49a4cc 0 (*) {'user': 'test'} (glob) |
3f469be5f3a7
effectflag: activate effect flag on test-obsolete test file
Boris Feld <boris.feld@octobus.net>
parents:
2566
diff
changeset
|
663 0d3f46688ccc6e756c7e96cf64c391c411309597 2033b4e494742365851fac84d276640cbf52833e 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
3f469be5f3a7
effectflag: activate effect flag on test-obsolete test file
Boris Feld <boris.feld@octobus.net>
parents:
2566
diff
changeset
|
664 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 9468a5f5d8b2c5d91e17474e95ae4791e9718fdf 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
3f469be5f3a7
effectflag: activate effect flag on test-obsolete test file
Boris Feld <boris.feld@octobus.net>
parents:
2566
diff
changeset
|
665 9468a5f5d8b2c5d91e17474e95ae4791e9718fdf 6db5e282cb91df5c43ff1f1287c119ff83230d42 0 (*) {'user': 'test'} (glob) |
3f469be5f3a7
effectflag: activate effect flag on test-obsolete test file
Boris Feld <boris.feld@octobus.net>
parents:
2566
diff
changeset
|
666 0b1b6dd009c037985363e2290a0b579819f659db 705ab2a6b72e2cd86edb799ebe15f2695f86143e 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
554
39eb12bb47c0
commit --amend: adap to core 63e45aee46d4
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
667 #no produced by 2.3 |
39eb12bb47c0
commit --amend: adap to core 63e45aee46d4
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
668 33d458d86621f3186c40bfccd77652f4a122743e 3734a65252e69ddcced85901647a4f335d40de1e 0 {'date': '* *', 'user': 'test'} (glob) |
354
bd26eb9714fb
obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
320
diff
changeset
|
669 |
1493
083220acba01
test-obsolete: clarify divergence detection output order
timeless@mozdev.org
parents:
1453
diff
changeset
|
670 Check divergence detection (note: multiple successors is sorted by changeset hash) |
354
bd26eb9714fb
obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
320
diff
changeset
|
671 |
bd26eb9714fb
obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
320
diff
changeset
|
672 $ hg up 9468a5f5d8b2 # add obsol_d'' |
bd26eb9714fb
obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
320
diff
changeset
|
673 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
bd26eb9714fb
obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
320
diff
changeset
|
674 $ mkcommit "obsolet_conflicting_d" |
bd26eb9714fb
obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
320
diff
changeset
|
675 $ hg summary |
554
39eb12bb47c0
commit --amend: adap to core 63e45aee46d4
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
676 parent: 1[46]:50f11e5e3a63 tip (re) |
354
bd26eb9714fb
obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
320
diff
changeset
|
677 add obsolet_conflicting_d |
bd26eb9714fb
obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
320
diff
changeset
|
678 branch: default |
bd26eb9714fb
obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
320
diff
changeset
|
679 commit: (clean) |
625
e291e5271694
prepare for Full scale filtering !!!
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
594
diff
changeset
|
680 update: (2|9|11) new changesets, (3|9|10) branch heads \(merge\) (re) |
1453
8ca31deb8db7
merge with stable
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1452
diff
changeset
|
681 phases: 3 draft |
2836
feaa52680682
log: bumped was renamed into phasedivergent
Boris Feld <boris.feld@octobus.net>
parents:
2835
diff
changeset
|
682 phase-divergent: 1 changesets |
359
43f79983f638
merge with conflicting detection
Pierre-Yves David <pierre-yves.david@logilab.fr>
diff
changeset
|
683 $ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63` |
2843
f588de9dd067
revset: divergent() is deprecated
Boris Feld <boris.feld@octobus.net>
parents:
2842
diff
changeset
|
684 $ hg log -r 'contentdivergent()' |
587
8152fedbac65
evolve: smarter code for divergent changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
586
diff
changeset
|
685 changeset: 12:6db5e282cb91 |
8152fedbac65
evolve: smarter code for divergent changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
586
diff
changeset
|
686 parent: 10:2033b4e49474 |
8152fedbac65
evolve: smarter code for divergent changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
586
diff
changeset
|
687 user: test |
8152fedbac65
evolve: smarter code for divergent changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
586
diff
changeset
|
688 date: Thu Jan 01 00:00:00 1970 +0000 |
2836
feaa52680682
log: bumped was renamed into phasedivergent
Boris Feld <boris.feld@octobus.net>
parents:
2835
diff
changeset
|
689 instability: phase-divergent, content-divergent |
587
8152fedbac65
evolve: smarter code for divergent changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
586
diff
changeset
|
690 summary: add obsol_d''' |
8152fedbac65
evolve: smarter code for divergent changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
586
diff
changeset
|
691 |
590
02cadd3dc9f4
evolve: adapt to 2.4 code
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
587
diff
changeset
|
692 changeset: 16:50f11e5e3a63 |
354
bd26eb9714fb
obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
320
diff
changeset
|
693 tag: tip |
bd26eb9714fb
obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
320
diff
changeset
|
694 parent: 11:9468a5f5d8b2 |
bd26eb9714fb
obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
320
diff
changeset
|
695 user: test |
bd26eb9714fb
obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
320
diff
changeset
|
696 date: Thu Jan 01 00:00:00 1970 +0000 |
2835
20c2499ce8bc
log: divergent was renamed into contentdivergent
Boris Feld <boris.feld@octobus.net>
parents:
2834
diff
changeset
|
697 instability: content-divergent |
354
bd26eb9714fb
obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
320
diff
changeset
|
698 summary: add obsolet_conflicting_d |
bd26eb9714fb
obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
320
diff
changeset
|
699 |
750
ddbea2fdee5e
evolve: allow updating to the successor if the parent is obsolete
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents:
747
diff
changeset
|
700 |
ddbea2fdee5e
evolve: allow updating to the successor if the parent is obsolete
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents:
747
diff
changeset
|
701 $ hg up --hidden 3 -q |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
1806
diff
changeset
|
702 working directory parent is obsolete! (0d3f46688ccc) |
750
ddbea2fdee5e
evolve: allow updating to the successor if the parent is obsolete
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents:
747
diff
changeset
|
703 $ hg evolve |
ddbea2fdee5e
evolve: allow updating to the successor if the parent is obsolete
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents:
747
diff
changeset
|
704 parent is obsolete with multiple successors: |
ddbea2fdee5e
evolve: allow updating to the successor if the parent is obsolete
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents:
747
diff
changeset
|
705 [4] add obsol_c' |
ddbea2fdee5e
evolve: allow updating to the successor if the parent is obsolete
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents:
747
diff
changeset
|
706 [10] add obsol_c |
ddbea2fdee5e
evolve: allow updating to the successor if the parent is obsolete
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents:
747
diff
changeset
|
707 [2] |
ddbea2fdee5e
evolve: allow updating to the successor if the parent is obsolete
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents:
747
diff
changeset
|
708 $ hg olog |
2416
23c0bef0b5d4
obshistory: rename the command to "olog"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2398
diff
changeset
|
709 @ 0d3f46688ccc (3) add obsol_c |
2832
07b9fcf8b6d3
output: update obsfate / obslog output order
Boris Feld <boris.feld@octobus.net>
parents:
2754
diff
changeset
|
710 | rewritten(parent) as 2033b4e49474 by test (*) (glob) |
07b9fcf8b6d3
output: update obsfate / obslog output order
Boris Feld <boris.feld@octobus.net>
parents:
2754
diff
changeset
|
711 | rewritten as 725c380fe99b by test (*) (glob) |
2416
23c0bef0b5d4
obshistory: rename the command to "olog"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2398
diff
changeset
|
712 | |
23c0bef0b5d4
obshistory: rename the command to "olog"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2398
diff
changeset
|
713 x 4538525df7e2 (2) add c |
2832
07b9fcf8b6d3
output: update obsfate / obslog output order
Boris Feld <boris.feld@octobus.net>
parents:
2754
diff
changeset
|
714 rewritten as 0d3f46688ccc by test (*) (glob) |
750
ddbea2fdee5e
evolve: allow updating to the successor if the parent is obsolete
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents:
747
diff
changeset
|
715 |
763
966e2659e989
import: warn about new unstable changesets
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents:
756
diff
changeset
|
716 |
966e2659e989
import: warn about new unstable changesets
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents:
756
diff
changeset
|
717 Check import reports new unstable changeset: |
966e2659e989
import: warn about new unstable changesets
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents:
756
diff
changeset
|
718 |
966e2659e989
import: warn about new unstable changesets
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents:
756
diff
changeset
|
719 $ hg up --hidden 2 |
966e2659e989
import: warn about new unstable changesets
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents:
756
diff
changeset
|
720 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
1806
diff
changeset
|
721 working directory parent is obsolete! (4538525df7e2) |
2835
20c2499ce8bc
log: divergent was renamed into contentdivergent
Boris Feld <boris.feld@octobus.net>
parents:
2834
diff
changeset
|
722 (4538525df7e2 has diverged, use 'hg evolve --list --contentdivergent' to resolve the issue) |
763
966e2659e989
import: warn about new unstable changesets
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents:
756
diff
changeset
|
723 $ hg export 9468a5f5d8b2 | hg import - |
966e2659e989
import: warn about new unstable changesets
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents:
756
diff
changeset
|
724 applying patch from stdin |
2854
66796d7b5415
warning: rename unstable warning message
Boris Feld <boris.feld@octobus.net>
parents:
2844
diff
changeset
|
725 1 new orphan changesets |
816
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
726 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
727 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
728 Relevant marker computation |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
729 ============================== |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
730 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
731 $ hg log -G --hidden |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
732 @ changeset: 17:a5f7a21fe7bc |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
733 | tag: tip |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
734 | parent: 2:4538525df7e2 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
735 | user: test |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
736 | date: Thu Jan 01 00:00:00 1970 +0000 |
2834
38db1466c6fb
log: unstable was renamed into orphan
Boris Feld <boris.feld@octobus.net>
parents:
2833
diff
changeset
|
737 | instability: orphan |
816
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
738 | summary: add obsol_d'' |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
739 | |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
740 | o changeset: 16:50f11e5e3a63 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
741 | | parent: 11:9468a5f5d8b2 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
742 | | user: test |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
743 | | date: Thu Jan 01 00:00:00 1970 +0000 |
2835
20c2499ce8bc
log: divergent was renamed into contentdivergent
Boris Feld <boris.feld@octobus.net>
parents:
2834
diff
changeset
|
744 | | instability: content-divergent |
816
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
745 | | summary: add obsolet_conflicting_d |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
746 | | |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
747 | | o changeset: 15:705ab2a6b72e |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
748 | | | parent: 10:2033b4e49474 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
749 | | | user: test |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
750 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
751 | | | summary: add f |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
752 | | | |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
753 | | | x changeset: 14:33d458d86621 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
754 | | | | user: test |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
755 | | | | date: Thu Jan 01 00:00:00 1970 +0000 |
2709
5d54de9cf50f
merge back with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2698
diff
changeset
|
756 | | | | obsolete: pruned |
816
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
757 | | | | summary: temporary amend commit for 0b1b6dd009c0 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
758 | | | | |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
759 | | | x changeset: 13:0b1b6dd009c0 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
760 | | |/ parent: 10:2033b4e49474 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
761 | | | user: test |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
762 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
2896
462adae9fea7
obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents:
2858
diff
changeset
|
763 | | | obsolete: amended as 705ab2a6b72e |
816
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
764 | | | summary: add f |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
765 | | | |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
766 | | | o changeset: 12:6db5e282cb91 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
767 | | |/ parent: 10:2033b4e49474 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
768 | | | user: test |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
769 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
2836
feaa52680682
log: bumped was renamed into phasedivergent
Boris Feld <boris.feld@octobus.net>
parents:
2835
diff
changeset
|
770 | | | instability: phase-divergent, content-divergent |
816
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
771 | | | summary: add obsol_d''' |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
772 | | | |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
773 | o | changeset: 11:9468a5f5d8b2 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
774 | |/ user: test |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
775 | | date: Thu Jan 01 00:00:00 1970 +0000 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
776 | | summary: add obsol_d'' |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
777 | | |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
778 | o changeset: 10:2033b4e49474 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
779 | | parent: 4:725c380fe99b |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
780 | | user: test |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
781 | | date: Thu Jan 01 00:00:00 1970 +0000 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
782 | | summary: add obsol_c |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
783 | | |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
784 | | x changeset: 9:83b5778897ad |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
785 | | parent: -1:000000000000 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
786 | | user: test |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
787 | | date: Thu Jan 01 00:00:00 1970 +0000 |
2709
5d54de9cf50f
merge back with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2698
diff
changeset
|
788 | | obsolete: pruned |
816
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
789 | | summary: add toto |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
790 | | |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
791 | | x changeset: 8:159dfc9fa5d3 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
792 | | | parent: 3:0d3f46688ccc |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
793 | | | user: test |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
794 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
2896
462adae9fea7
obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents:
2858
diff
changeset
|
795 | | | obsolete: rebased as 9468a5f5d8b2 |
816
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
796 | | | summary: add obsol_d'' |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
797 | | | |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
798 | | | x changeset: 7:909a0fb57e5d |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
799 | | |/ parent: 3:0d3f46688ccc |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
800 | | | user: test |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
801 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
2709
5d54de9cf50f
merge back with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2698
diff
changeset
|
802 | | | obsolete: rewritten as 159dfc9fa5d3 |
816
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
803 | | | summary: add obsol_d' |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
804 | | | |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
805 | | | x changeset: 6:95de7fc6918d |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
806 | | |/ parent: 3:0d3f46688ccc |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
807 | | | user: test |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
808 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
2709
5d54de9cf50f
merge back with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2698
diff
changeset
|
809 | | | obsolete: rewritten as 909a0fb57e5d |
816
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
810 | | | summary: add obsol_d |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
811 | | | |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
812 | | | x changeset: 5:a7a6f2b5d8a5 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
813 | | |/ parent: 3:0d3f46688ccc |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
814 | | | user: test |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
815 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
2709
5d54de9cf50f
merge back with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2698
diff
changeset
|
816 | | | obsolete: rewritten as 95de7fc6918d |
5d54de9cf50f
merge back with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2698
diff
changeset
|
817 | | | obsolete: rewritten as 50f11e5e3a63 |
816
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
818 | | | summary: add d |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
819 | | | |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
820 | o | changeset: 4:725c380fe99b |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
821 | | | parent: 1:7c3bad9141dc |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
822 | | | user: test |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
823 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
824 | | | summary: add obsol_c' |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
825 | | | |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
826 | | x changeset: 3:0d3f46688ccc |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
827 | |/ parent: 1:7c3bad9141dc |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
828 | | user: test |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
829 | | date: Thu Jan 01 00:00:00 1970 +0000 |
2709
5d54de9cf50f
merge back with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2698
diff
changeset
|
830 | | obsolete: rewritten as 725c380fe99b |
2896
462adae9fea7
obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents:
2858
diff
changeset
|
831 | | obsolete: rebased as 2033b4e49474 |
816
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
832 | | summary: add obsol_c |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
833 | | |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
834 x | changeset: 2:4538525df7e2 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
835 |/ user: test |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
836 | date: Thu Jan 01 00:00:00 1970 +0000 |
2709
5d54de9cf50f
merge back with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2698
diff
changeset
|
837 | obsolete: rewritten as 0d3f46688ccc |
816
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
838 | summary: add c |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
839 | |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
840 o changeset: 1:7c3bad9141dc |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
841 | user: test |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
842 | date: Thu Jan 01 00:00:00 1970 +0000 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
843 | summary: add b |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
844 | |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
845 o changeset: 0:1f0dee641bb7 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
846 user: test |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
847 date: Thu Jan 01 00:00:00 1970 +0000 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
848 summary: add a |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
849 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
850 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
851 Simple rewrite |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
852 |
1068
9f87b103f7b5
evolve: drop debugobsoleterelevant
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1067
diff
changeset
|
853 $ hg --hidden debugobsolete --rev 3 |
2571
3f469be5f3a7
effectflag: activate effect flag on test-obsolete test file
Boris Feld <boris.feld@octobus.net>
parents:
2566
diff
changeset
|
854 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 (*) {'user': 'test'} (glob) |
816
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
855 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
856 simple rewrite with a prune attached to it |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
857 |
1068
9f87b103f7b5
evolve: drop debugobsoleterelevant
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1067
diff
changeset
|
858 $ hg debugobsolete --rev 15 |
2571
3f469be5f3a7
effectflag: activate effect flag on test-obsolete test file
Boris Feld <boris.feld@octobus.net>
parents:
2566
diff
changeset
|
859 0b1b6dd009c037985363e2290a0b579819f659db 705ab2a6b72e2cd86edb799ebe15f2695f86143e 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
3f469be5f3a7
effectflag: activate effect flag on test-obsolete test file
Boris Feld <boris.feld@octobus.net>
parents:
2566
diff
changeset
|
860 33d458d86621f3186c40bfccd77652f4a122743e 0 {0b1b6dd009c037985363e2290a0b579819f659db} (*) {'ef1': '*', 'user': 'test'} (glob) |
816
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
861 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
862 Transitive rewrite |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
863 |
1068
9f87b103f7b5
evolve: drop debugobsoleterelevant
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1067
diff
changeset
|
864 $ hg --hidden debugobsolete --rev 8 |
2571
3f469be5f3a7
effectflag: activate effect flag on test-obsolete test file
Boris Feld <boris.feld@octobus.net>
parents:
2566
diff
changeset
|
865 909a0fb57e5d909f353d89e394ffd7e0890fec88 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 0 (*) {'user': 'test'} (glob) |
3f469be5f3a7
effectflag: activate effect flag on test-obsolete test file
Boris Feld <boris.feld@octobus.net>
parents:
2566
diff
changeset
|
866 95de7fc6918dea4c9c8d5382f50649794b474c4a 909a0fb57e5d909f353d89e394ffd7e0890fec88 0 (*) {'user': 'test'} (glob) |
3f469be5f3a7
effectflag: activate effect flag on test-obsolete test file
Boris Feld <boris.feld@octobus.net>
parents:
2566
diff
changeset
|
867 a7a6f2b5d8a54b81bc7aa2fba2934ad6d700a79e 95de7fc6918dea4c9c8d5382f50649794b474c4a 0 (*) {'user': 'test'} (glob) |
816
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
868 |