Mercurial > evolve
annotate tests/test-obsolete.t @ 816:03587920dfd9
evolve: add relevant marker exchange machinery
This is going to be needed for obsolescence marker exchange.
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Thu, 27 Feb 2014 18:30:55 -0800 |
parents | b96d51a357bd |
children | c2bf0eb727f1 |
rev | line source |
---|---|
32
c27491be4431
obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
1 $ cat >> $HGRCPATH <<EOF |
c27491be4431
obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
2 > [web] |
c27491be4431
obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
3 > push_ssl = false |
c27491be4431
obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
4 > allow_push = * |
112
eae9be0ee00e
adapt obsolete to phase.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
98
diff
changeset
|
5 > [phases] |
eae9be0ee00e
adapt obsolete to phase.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
98
diff
changeset
|
6 > publish=False |
32
c27491be4431
obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
7 > [extensions] |
491
6989d8fe4ed2
merge evolve and obsolete
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
486
diff
changeset
|
8 > hgext.rebase= |
32
c27491be4431
obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
9 > EOF |
491
6989d8fe4ed2
merge evolve and obsolete
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
486
diff
changeset
|
10 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH |
32
c27491be4431
obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
11 $ mkcommit() { |
c27491be4431
obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
12 > echo "$1" > "$1" |
c27491be4431
obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
13 > hg add "$1" |
c27491be4431
obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
14 > hg ci -m "add $1" |
c27491be4431
obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
15 > } |
343 | 16 $ getid() { |
625
e291e5271694
prepare for Full scale filtering !!!
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
594
diff
changeset
|
17 > hg id --hidden --debug -ir "$1" |
343 | 18 > } |
32
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 | |
36 $ hg debugobsolete | |
441
d702f0d26c6a
obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
421
diff
changeset
|
37 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 {'date': '', 'user': 'test'} (glob) |
343 | 38 |
39 | 39 |
398
42828b0ace98
obsolete: fix hidden() revset
Patrick Mezard <patrick@mezard.eu>
parents:
390
diff
changeset
|
40 Test hidden() revset |
42828b0ace98
obsolete: fix hidden() revset
Patrick Mezard <patrick@mezard.eu>
parents:
390
diff
changeset
|
41 |
42828b0ace98
obsolete: fix hidden() revset
Patrick Mezard <patrick@mezard.eu>
parents:
390
diff
changeset
|
42 $ qlog -r 'hidden()' --hidden |
42828b0ace98
obsolete: fix hidden() revset
Patrick Mezard <patrick@mezard.eu>
parents:
390
diff
changeset
|
43 2 |
42828b0ace98
obsolete: fix hidden() revset
Patrick Mezard <patrick@mezard.eu>
parents:
390
diff
changeset
|
44 - 4538525df7e2 |
39 | 45 |
46 Test that obsolete changeset are hidden | |
47 | |
45
d89453a10991
include hash in test.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
44
diff
changeset
|
48 $ qlog |
49
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
49 3 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
50 - 0d3f46688ccc |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
51 1 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
52 - 7c3bad9141dc |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
53 0 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
54 - 1f0dee641bb7 |
45
d89453a10991
include hash in test.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
44
diff
changeset
|
55 $ qlog --hidden |
49
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
56 3 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
57 - 0d3f46688ccc |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
58 2 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
59 - 4538525df7e2 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
60 1 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
61 - 7c3bad9141dc |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
62 0 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
63 - 1f0dee641bb7 |
45
d89453a10991
include hash in test.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
44
diff
changeset
|
64 $ qlog -r 'obsolete()' --hidden |
49
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
65 2 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
66 - 4538525df7e2 |
39 | 67 |
143
0599fb01dc41
add an obsolete parent revset and related alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
136
diff
changeset
|
68 Test that obsolete parent a properly computed |
0599fb01dc41
add an obsolete parent revset and related alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
136
diff
changeset
|
69 |
305
0b444d7c5c96
update revset vocabulary to use precursors, successors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
299
diff
changeset
|
70 $ 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
|
71 2 |
0599fb01dc41
add an obsolete parent revset and related alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
136
diff
changeset
|
72 - 4538525df7e2 |
0599fb01dc41
add an obsolete parent revset and related alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
136
diff
changeset
|
73 $ qlog -r . |
0599fb01dc41
add an obsolete parent revset and related alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
136
diff
changeset
|
74 3 |
0599fb01dc41
add an obsolete parent revset and related alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
136
diff
changeset
|
75 - 0d3f46688ccc |
0599fb01dc41
add an obsolete parent revset and related alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
136
diff
changeset
|
76 $ hg odiff |
0599fb01dc41
add an obsolete parent revset and related alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
136
diff
changeset
|
77 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
|
78 --- 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
|
79 +++ /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
|
80 @@ -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
|
81 -c |
0599fb01dc41
add an obsolete parent revset and related alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
136
diff
changeset
|
82 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
|
83 --- /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
|
84 +++ 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
|
85 @@ -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
|
86 +obsol_c |
0599fb01dc41
add an obsolete parent revset and related alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
136
diff
changeset
|
87 |
306
8cfa3163dfaa
obsolete: add precursors and successors revset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
305
diff
changeset
|
88 Test that obsolete successors a properly computed |
8cfa3163dfaa
obsolete: add precursors and successors revset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
305
diff
changeset
|
89 |
8cfa3163dfaa
obsolete: add precursors and successors revset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
305
diff
changeset
|
90 $ qlog -r 'successors(2)' --hidden |
8cfa3163dfaa
obsolete: add precursors and successors revset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
305
diff
changeset
|
91 3 |
8cfa3163dfaa
obsolete: add precursors and successors revset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
305
diff
changeset
|
92 - 0d3f46688ccc |
8cfa3163dfaa
obsolete: add precursors and successors revset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
305
diff
changeset
|
93 |
40
b9a5a596d9ef
proper computation of hidden changeset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
39
diff
changeset
|
94 test obsolete changeset with no-obsolete descendant |
b9a5a596d9ef
proper computation of hidden changeset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
39
diff
changeset
|
95 $ hg up 1 -q |
b9a5a596d9ef
proper computation of hidden changeset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
39
diff
changeset
|
96 $ mkcommit "obsol_c'" # 4 (on 1) |
b9a5a596d9ef
proper computation of hidden changeset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
39
diff
changeset
|
97 created new head |
343 | 98 $ hg debugobsolete `getid 3` `getid 4` |
45
d89453a10991
include hash in test.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
44
diff
changeset
|
99 $ qlog |
49
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
100 4 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
101 - 725c380fe99b |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
102 1 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
103 - 7c3bad9141dc |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
104 0 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
105 - 1f0dee641bb7 |
45
d89453a10991
include hash in test.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
44
diff
changeset
|
106 $ qlog -r 'obsolete()' --hidden |
49
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
107 2 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
108 - 4538525df7e2 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
109 3 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
110 - 0d3f46688ccc |
305
0b444d7c5c96
update revset vocabulary to use precursors, successors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
299
diff
changeset
|
111 $ qlog -r 'allprecursors(4)' --hidden |
144
f387658d6d22
Add a bosancestors revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
143
diff
changeset
|
112 2 |
f387658d6d22
Add a bosancestors revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
143
diff
changeset
|
113 - 4538525df7e2 |
f387658d6d22
Add a bosancestors revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
143
diff
changeset
|
114 3 |
f387658d6d22
Add a bosancestors revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
143
diff
changeset
|
115 - 0d3f46688ccc |
306
8cfa3163dfaa
obsolete: add precursors and successors revset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
305
diff
changeset
|
116 $ qlog -r 'allsuccessors(2)' --hidden |
8cfa3163dfaa
obsolete: add precursors and successors revset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
305
diff
changeset
|
117 3 |
8cfa3163dfaa
obsolete: add precursors and successors revset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
305
diff
changeset
|
118 - 0d3f46688ccc |
8cfa3163dfaa
obsolete: add precursors and successors revset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
305
diff
changeset
|
119 4 |
8cfa3163dfaa
obsolete: add precursors and successors revset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
305
diff
changeset
|
120 - 725c380fe99b |
625
e291e5271694
prepare for Full scale filtering !!!
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
594
diff
changeset
|
121 $ hg up --hidden 3 -q |
743
af74a5cdf96b
conform to the Mercurial custom of lowercase messages
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
652
diff
changeset
|
122 working directory parent is obsolete! |
745
99e51aff724b
add obsolete parents wrapper to the 'parents' command
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
743
diff
changeset
|
123 (reported by parents too) |
99e51aff724b
add obsolete parents wrapper to the 'parents' command
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
743
diff
changeset
|
124 $ hg parents |
99e51aff724b
add obsolete parents wrapper to the 'parents' command
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
743
diff
changeset
|
125 changeset: 3:0d3f46688ccc |
99e51aff724b
add obsolete parents wrapper to the 'parents' command
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
743
diff
changeset
|
126 parent: 1:7c3bad9141dc |
99e51aff724b
add obsolete parents wrapper to the 'parents' command
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
743
diff
changeset
|
127 user: test |
99e51aff724b
add obsolete parents wrapper to the 'parents' command
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
743
diff
changeset
|
128 date: Thu Jan 01 00:00:00 1970 +0000 |
99e51aff724b
add obsolete parents wrapper to the 'parents' command
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
743
diff
changeset
|
129 summary: add obsol_c |
99e51aff724b
add obsolete parents wrapper to the 'parents' command
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
743
diff
changeset
|
130 |
99e51aff724b
add obsolete parents wrapper to the 'parents' command
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
743
diff
changeset
|
131 working directory parent is obsolete! |
40
b9a5a596d9ef
proper computation of hidden changeset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
39
diff
changeset
|
132 $ mkcommit d # 5 (on 3) |
486 | 133 1 new unstable changesets |
45
d89453a10991
include hash in test.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
44
diff
changeset
|
134 $ qlog -r 'obsolete()' |
49
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
135 3 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
136 - 0d3f46688ccc |
40
b9a5a596d9ef
proper computation of hidden changeset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
39
diff
changeset
|
137 |
136
915728be8afd
add test for revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
135
diff
changeset
|
138 $ qlog -r 'extinct()' --hidden |
915728be8afd
add test for revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
135
diff
changeset
|
139 2 |
915728be8afd
add test for revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
135
diff
changeset
|
140 - 4538525df7e2 |
915728be8afd
add test for revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
135
diff
changeset
|
141 $ qlog -r 'suspended()' |
915728be8afd
add test for revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
135
diff
changeset
|
142 3 |
915728be8afd
add test for revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
135
diff
changeset
|
143 - 0d3f46688ccc |
915728be8afd
add test for revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
135
diff
changeset
|
144 $ qlog -r 'unstable()' |
915728be8afd
add test for revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
135
diff
changeset
|
145 5 |
915728be8afd
add test for revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
135
diff
changeset
|
146 - a7a6f2b5d8a5 |
915728be8afd
add test for revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
135
diff
changeset
|
147 |
299
eda6491ca269
obsolete: add 'obsolete' keyword
Patrick Mezard <patrick@mezard.eu>
parents:
280
diff
changeset
|
148 Test obsolete keyword |
eda6491ca269
obsolete: add 'obsolete' keyword
Patrick Mezard <patrick@mezard.eu>
parents:
280
diff
changeset
|
149 |
570
1c45a07dda51
test-obsolete: clean up useless inlined option
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
554
diff
changeset
|
150 $ hg log -G --template '{rev}:{node|short}@{branch}({obsolete}/{phase}) {desc|firstline}\n' \ |
299
eda6491ca269
obsolete: add 'obsolete' keyword
Patrick Mezard <patrick@mezard.eu>
parents:
280
diff
changeset
|
151 > --hidden |
385
cdcdedc532b7
obsolete: Stop turning obsolete secret changesets secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
381
diff
changeset
|
152 @ 5:a7a6f2b5d8a5@default(unstable/draft) add d |
299
eda6491ca269
obsolete: add 'obsolete' keyword
Patrick Mezard <patrick@mezard.eu>
parents:
280
diff
changeset
|
153 | |
eda6491ca269
obsolete: add 'obsolete' keyword
Patrick Mezard <patrick@mezard.eu>
parents:
280
diff
changeset
|
154 | o 4:725c380fe99b@default(stable/draft) add obsol_c' |
eda6491ca269
obsolete: add 'obsolete' keyword
Patrick Mezard <patrick@mezard.eu>
parents:
280
diff
changeset
|
155 | | |
385
cdcdedc532b7
obsolete: Stop turning obsolete secret changesets secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
381
diff
changeset
|
156 x | 3:0d3f46688ccc@default(suspended/draft) add obsol_c |
299
eda6491ca269
obsolete: add 'obsolete' keyword
Patrick Mezard <patrick@mezard.eu>
parents:
280
diff
changeset
|
157 |/ |
385
cdcdedc532b7
obsolete: Stop turning obsolete secret changesets secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
381
diff
changeset
|
158 | x 2:4538525df7e2@default(extinct/draft) add c |
299
eda6491ca269
obsolete: add 'obsolete' keyword
Patrick Mezard <patrick@mezard.eu>
parents:
280
diff
changeset
|
159 |/ |
eda6491ca269
obsolete: add 'obsolete' keyword
Patrick Mezard <patrick@mezard.eu>
parents:
280
diff
changeset
|
160 o 1:7c3bad9141dc@default(stable/draft) add b |
eda6491ca269
obsolete: add 'obsolete' keyword
Patrick Mezard <patrick@mezard.eu>
parents:
280
diff
changeset
|
161 | |
eda6491ca269
obsolete: add 'obsolete' keyword
Patrick Mezard <patrick@mezard.eu>
parents:
280
diff
changeset
|
162 o 0:1f0dee641bb7@default(stable/public) add a |
eda6491ca269
obsolete: add 'obsolete' keyword
Patrick Mezard <patrick@mezard.eu>
parents:
280
diff
changeset
|
163 |
eda6491ca269
obsolete: add 'obsolete' keyword
Patrick Mezard <patrick@mezard.eu>
parents:
280
diff
changeset
|
164 |
44
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
165 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
|
166 |
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
167 $ 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
|
168 $ 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
|
169 abort: empty revision set |
cdcdedc532b7
obsolete: Stop turning obsolete secret changesets secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
381
diff
changeset
|
170 [255] |
217
786eb34d93ea
obsolete: refuse to push unstable changeset without -f
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
215
diff
changeset
|
171 $ 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
|
172 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
|
173 searching for changes |
590
02cadd3dc9f4
evolve: adapt to 2.4 code
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
587
diff
changeset
|
174 abort: push includes unstable changeset: a7a6f2b5d8a5! |
492
7ecd41520dae
rename `stabilize` to `evolve`
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
491
diff
changeset
|
175 (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
|
176 [255] |
786eb34d93ea
obsolete: refuse to push unstable changeset without -f
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
215
diff
changeset
|
177 $ 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
|
178 pushing to ../other-new |
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
179 searching for changes |
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
180 adding changesets |
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
181 adding manifests |
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
182 adding file changes |
46
3b0364fc822f
Do not propagate obsolete changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
45
diff
changeset
|
183 added 5 changesets with 5 changes to 5 files (+1 heads) |
215
0eceb5a48485
obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
214
diff
changeset
|
184 $ hg -R ../other-new verify |
0eceb5a48485
obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
214
diff
changeset
|
185 checking changesets |
0eceb5a48485
obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
214
diff
changeset
|
186 checking manifests |
0eceb5a48485
obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
214
diff
changeset
|
187 crosschecking files in changesets and manifests |
0eceb5a48485
obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
214
diff
changeset
|
188 checking files |
0eceb5a48485
obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
214
diff
changeset
|
189 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
|
190 $ qlog -R ../other-new -r 'obsolete()' |
49
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
191 2 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
192 - 0d3f46688ccc |
45
d89453a10991
include hash in test.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
44
diff
changeset
|
193 $ qlog -R ../other-new |
49
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
194 4 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
195 - a7a6f2b5d8a5 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
196 3 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
197 - 725c380fe99b |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
198 2 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
199 - 0d3f46688ccc |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
200 1 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
201 - 7c3bad9141dc |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
202 0 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
203 - 1f0dee641bb7 |
625
e291e5271694
prepare for Full scale filtering !!!
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
594
diff
changeset
|
204 $ hg up --hidden 3 -q |
743
af74a5cdf96b
conform to the Mercurial custom of lowercase messages
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
652
diff
changeset
|
205 working directory parent is obsolete! |
44
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
206 $ mkcommit obsol_d # 6 |
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
207 created new head |
486 | 208 1 new unstable changesets |
343 | 209 $ hg debugobsolete `getid 5` `getid 6` |
44
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
210 $ qlog |
49
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
211 6 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
212 - 95de7fc6918d |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
213 4 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
214 - 725c380fe99b |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
215 3 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
216 - 0d3f46688ccc |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
217 1 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
218 - 7c3bad9141dc |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
219 0 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
220 - 1f0dee641bb7 |
44
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
221 $ qlog -r 'obsolete()' |
49
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
222 3 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
223 - 0d3f46688ccc |
217
786eb34d93ea
obsolete: refuse to push unstable changeset without -f
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
215
diff
changeset
|
224 $ 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
|
225 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
|
226 searching for changes |
590
02cadd3dc9f4
evolve: adapt to 2.4 code
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
587
diff
changeset
|
227 abort: push includes unstable changeset: 95de7fc6918d! |
492
7ecd41520dae
rename `stabilize` to `evolve`
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
491
diff
changeset
|
228 (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
|
229 [255] |
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 -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
|
231 pushing to ../other-new |
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
232 searching for changes |
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
233 adding changesets |
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
234 adding manifests |
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
235 adding file changes |
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
236 added 1 changesets with 1 changes to 1 files (+1 heads) |
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
237 $ qlog -R ../other-new |
49
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
238 5 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
239 - 95de7fc6918d |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
240 3 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
241 - 725c380fe99b |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
242 2 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
243 - 0d3f46688ccc |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
244 1 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
245 - 7c3bad9141dc |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
246 0 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
247 - 1f0dee641bb7 |
44
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
248 $ qlog -R ../other-new -r 'obsolete()' |
49
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
249 2 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
250 - 0d3f46688ccc |
214
a140d1857931
obsolete: do not warn about unpushed extinct changeset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
206
diff
changeset
|
251 |
a140d1857931
obsolete: do not warn about unpushed extinct changeset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
206
diff
changeset
|
252 Pushing again does not advertise extinct changeset |
a140d1857931
obsolete: do not warn about unpushed extinct changeset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
206
diff
changeset
|
253 |
a140d1857931
obsolete: do not warn about unpushed extinct changeset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
206
diff
changeset
|
254 $ 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
|
255 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
|
256 searching for changes |
385
cdcdedc532b7
obsolete: Stop turning obsolete secret changesets secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
381
diff
changeset
|
257 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
|
258 [1] |
a140d1857931
obsolete: do not warn about unpushed extinct changeset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
206
diff
changeset
|
259 |
625
e291e5271694
prepare for Full scale filtering !!!
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
594
diff
changeset
|
260 $ hg up --hidden -q .^ # 3 |
743
af74a5cdf96b
conform to the Mercurial custom of lowercase messages
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
652
diff
changeset
|
261 working directory parent is obsolete! |
44
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
262 $ mkcommit "obsol_d'" # 7 |
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
263 created new head |
486 | 264 1 new unstable changesets |
343 | 265 $ hg debugobsolete `getid 6` `getid 7` |
44
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
266 $ 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
|
267 pulling from . |
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
268 searching for changes |
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
269 adding changesets |
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
270 adding manifests |
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
271 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
|
272 added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) |
3d5bed04ee4c
test: adapt to the way the bundle is generated
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
594
diff
changeset
|
273 \(run 'hg heads( \.)?' to see heads, 'hg merge' to merge\) (re) |
44
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
274 $ 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
|
275 6 |
49
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
276 - 909a0fb57e5d |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
277 3 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
278 - 725c380fe99b |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
279 2 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
280 - 0d3f46688ccc |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
281 1 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
282 - 7c3bad9141dc |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
283 0 |
4e804af47e57
Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
46
diff
changeset
|
284 - 1f0dee641bb7 |
46
3b0364fc822f
Do not propagate obsolete changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
45
diff
changeset
|
285 |
3b0364fc822f
Do not propagate obsolete changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
45
diff
changeset
|
286 pushing to stuff that doesn't support obsolete |
3b0364fc822f
Do not propagate obsolete changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
45
diff
changeset
|
287 |
405
b5b1bf5166a2
obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
398
diff
changeset
|
288 DISABLED. the _enable switch it global :-/ |
b5b1bf5166a2
obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
398
diff
changeset
|
289 |
b5b1bf5166a2
obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
398
diff
changeset
|
290 .. $ hg init ../other-old |
b5b1bf5166a2
obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
398
diff
changeset
|
291 .. > # 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
|
292 .. > # 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
|
293 .. $ echo '[extensions]' > ../other-old/.hg/hgrc |
b5b1bf5166a2
obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
398
diff
changeset
|
294 .. $ 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
|
295 .. $ hg push ../other-old |
b5b1bf5166a2
obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
398
diff
changeset
|
296 .. pushing to ../other-old |
b5b1bf5166a2
obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
398
diff
changeset
|
297 .. searching for changes |
b5b1bf5166a2
obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
398
diff
changeset
|
298 .. 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
|
299 .. (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
|
300 .. [255] |
b5b1bf5166a2
obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
398
diff
changeset
|
301 .. $ hg push -f ../other-old |
b5b1bf5166a2
obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
398
diff
changeset
|
302 .. pushing to ../other-old |
b5b1bf5166a2
obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
398
diff
changeset
|
303 .. searching for changes |
b5b1bf5166a2
obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
398
diff
changeset
|
304 .. adding changesets |
b5b1bf5166a2
obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
398
diff
changeset
|
305 .. adding manifests |
b5b1bf5166a2
obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
398
diff
changeset
|
306 .. adding file changes |
b5b1bf5166a2
obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
398
diff
changeset
|
307 .. 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
|
308 .. $ qlog -R ../other-ol |
b5b1bf5166a2
obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
398
diff
changeset
|
309 .. 4 |
b5b1bf5166a2
obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
398
diff
changeset
|
310 .. - 909a0fb57e5d |
b5b1bf5166a2
obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
398
diff
changeset
|
311 .. 3 |
b5b1bf5166a2
obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
398
diff
changeset
|
312 .. - 725c380fe99b |
b5b1bf5166a2
obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
398
diff
changeset
|
313 .. 2 |
b5b1bf5166a2
obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
398
diff
changeset
|
314 .. - 0d3f46688ccc |
b5b1bf5166a2
obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
398
diff
changeset
|
315 .. 1 |
b5b1bf5166a2
obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
398
diff
changeset
|
316 .. - 7c3bad9141dc |
b5b1bf5166a2
obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
398
diff
changeset
|
317 .. 0 |
b5b1bf5166a2
obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
398
diff
changeset
|
318 .. - 1f0dee641bb7 |
44
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
319 |
50
19b22ad56b32
clone support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
49
diff
changeset
|
320 clone support |
44
b243c10a5fbe
Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
40
diff
changeset
|
321 |
50
19b22ad56b32
clone support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
49
diff
changeset
|
322 $ 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
|
323 > # 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
|
324 updating to branch default |
19b22ad56b32
clone support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
49
diff
changeset
|
325 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
|
326 |
389
cb575242d2ba
test-obsolete: handle local clones copying obsolete markers
Patrick Mezard <patrick@mezard.eu>
parents:
385
diff
changeset
|
327 $ 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
|
328 7 |
cdcdedc532b7
obsolete: Stop turning obsolete secret changesets secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
381
diff
changeset
|
329 - 909a0fb57e5d |
cdcdedc532b7
obsolete: Stop turning obsolete secret changesets secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
381
diff
changeset
|
330 6 |
cdcdedc532b7
obsolete: Stop turning obsolete secret changesets secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
381
diff
changeset
|
331 - 95de7fc6918d |
cdcdedc532b7
obsolete: Stop turning obsolete secret changesets secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
381
diff
changeset
|
332 5 |
cdcdedc532b7
obsolete: Stop turning obsolete secret changesets secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
381
diff
changeset
|
333 - a7a6f2b5d8a5 |
135
1a08daef8a53
obsolete: add revset for various error case
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
112
diff
changeset
|
334 4 |
385
cdcdedc532b7
obsolete: Stop turning obsolete secret changesets secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
381
diff
changeset
|
335 - 725c380fe99b |
135
1a08daef8a53
obsolete: add revset for various error case
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
112
diff
changeset
|
336 3 |
385
cdcdedc532b7
obsolete: Stop turning obsolete secret changesets secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
381
diff
changeset
|
337 - 0d3f46688ccc |
135
1a08daef8a53
obsolete: add revset for various error case
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
112
diff
changeset
|
338 2 |
385
cdcdedc532b7
obsolete: Stop turning obsolete secret changesets secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
381
diff
changeset
|
339 - 4538525df7e2 |
50
19b22ad56b32
clone support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
49
diff
changeset
|
340 1 |
19b22ad56b32
clone support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
49
diff
changeset
|
341 - 7c3bad9141dc |
19b22ad56b32
clone support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
49
diff
changeset
|
342 0 |
19b22ad56b32
clone support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
49
diff
changeset
|
343 - 1f0dee641bb7 |
19b22ad56b32
clone support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
49
diff
changeset
|
344 |
52
62bdc2567099
Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
51
diff
changeset
|
345 Test rollback support |
62bdc2567099
Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
51
diff
changeset
|
346 |
625
e291e5271694
prepare for Full scale filtering !!!
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
594
diff
changeset
|
347 $ hg up --hidden .^ -q # 3 |
743
af74a5cdf96b
conform to the Mercurial custom of lowercase messages
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
652
diff
changeset
|
348 working directory parent is obsolete! |
52
62bdc2567099
Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
51
diff
changeset
|
349 $ mkcommit "obsol_d''" |
62bdc2567099
Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
51
diff
changeset
|
350 created new head |
486 | 351 1 new unstable changesets |
343 | 352 $ hg debugobsolete `getid 7` `getid 8` |
215
0eceb5a48485
obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
214
diff
changeset
|
353 $ cd ../other-new |
0eceb5a48485
obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
214
diff
changeset
|
354 $ hg up -q 3 |
0eceb5a48485
obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
214
diff
changeset
|
355 $ hg pull ../local/ |
0eceb5a48485
obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
214
diff
changeset
|
356 pulling from ../local/ |
52
62bdc2567099
Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
51
diff
changeset
|
357 searching for changes |
62bdc2567099
Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
51
diff
changeset
|
358 adding changesets |
62bdc2567099
Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
51
diff
changeset
|
359 adding manifests |
62bdc2567099
Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
51
diff
changeset
|
360 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
|
361 added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) |
3d5bed04ee4c
test: adapt to the way the bundle is generated
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
594
diff
changeset
|
362 \(run 'hg heads( \.)?' to see heads, 'hg merge' to merge\) (re) |
52
62bdc2567099
Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
51
diff
changeset
|
363 |
215
0eceb5a48485
obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
214
diff
changeset
|
364 $ 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
|
365 $ qlog |
135
1a08daef8a53
obsolete: add revset for various error case
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
112
diff
changeset
|
366 7 |
52
62bdc2567099
Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
51
diff
changeset
|
367 - 159dfc9fa5d3 |
62bdc2567099
Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
51
diff
changeset
|
368 3 |
62bdc2567099
Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
51
diff
changeset
|
369 - 725c380fe99b |
62bdc2567099
Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
51
diff
changeset
|
370 2 |
62bdc2567099
Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
51
diff
changeset
|
371 - 0d3f46688ccc |
62bdc2567099
Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
51
diff
changeset
|
372 1 |
62bdc2567099
Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
51
diff
changeset
|
373 - 7c3bad9141dc |
62bdc2567099
Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
51
diff
changeset
|
374 0 |
62bdc2567099
Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
51
diff
changeset
|
375 - 1f0dee641bb7 |
215
0eceb5a48485
obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
214
diff
changeset
|
376 $ hg rollback |
135
1a08daef8a53
obsolete: add revset for various error case
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
112
diff
changeset
|
377 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
|
378 working directory now based on revision 3 |
0eceb5a48485
obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
214
diff
changeset
|
379 $ hg summary |
0eceb5a48485
obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
214
diff
changeset
|
380 parent: 3:725c380fe99b |
0eceb5a48485
obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
214
diff
changeset
|
381 add obsol_c' |
0eceb5a48485
obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
214
diff
changeset
|
382 branch: default |
0eceb5a48485
obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
214
diff
changeset
|
383 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
|
384 update: 2 new changesets, 2 branch heads (merge) |
479
b63da0fb8ee5
obsolete: add obsolete data to summary.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
473
diff
changeset
|
385 unstable: 1 changesets |
215
0eceb5a48485
obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
214
diff
changeset
|
386 $ qlog |
135
1a08daef8a53
obsolete: add revset for various error case
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
112
diff
changeset
|
387 6 |
52
62bdc2567099
Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
51
diff
changeset
|
388 - 909a0fb57e5d |
62bdc2567099
Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
51
diff
changeset
|
389 3 |
62bdc2567099
Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
51
diff
changeset
|
390 - 725c380fe99b |
62bdc2567099
Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
51
diff
changeset
|
391 2 |
62bdc2567099
Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
51
diff
changeset
|
392 - 0d3f46688ccc |
62bdc2567099
Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
51
diff
changeset
|
393 1 |
62bdc2567099
Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
51
diff
changeset
|
394 - 7c3bad9141dc |
62bdc2567099
Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
51
diff
changeset
|
395 0 |
62bdc2567099
Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
51
diff
changeset
|
396 - 1f0dee641bb7 |
215
0eceb5a48485
obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
214
diff
changeset
|
397 $ cd ../local |
52
62bdc2567099
Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
51
diff
changeset
|
398 |
112
eae9be0ee00e
adapt obsolete to phase.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
98
diff
changeset
|
399 obsolete public changeset |
eae9be0ee00e
adapt obsolete to phase.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
98
diff
changeset
|
400 |
eae9be0ee00e
adapt obsolete to phase.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
98
diff
changeset
|
401 # move draft boundary from 0 to 1 |
eae9be0ee00e
adapt obsolete to phase.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
98
diff
changeset
|
402 $ 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
|
403 |
d7b11772f0b5
[obsolete] published changeset can't be obsoleted
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
52
diff
changeset
|
404 $ hg up null |
d7b11772f0b5
[obsolete] published changeset can't be obsoleted
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
52
diff
changeset
|
405 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
|
406 $ 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
|
407 created new head |
80
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
408 $ hg id -n |
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
409 9 |
343 | 410 $ hg debugobsolete `getid 0` `getid 9` |
411 83b5778897ad try to obsolete immutable changeset 1f0dee641bb7 | |
412 # 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
|
413 # 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
|
414 $ qlog -r 'obsolete()' |
d7b11772f0b5
[obsolete] published changeset can't be obsoleted
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
52
diff
changeset
|
415 3 |
d7b11772f0b5
[obsolete] published changeset can't be obsoleted
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
52
diff
changeset
|
416 - 0d3f46688ccc |
80
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
417 allow to just kill changeset |
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
418 |
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
419 $ qlog |
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
420 9 |
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
421 - 83b5778897ad |
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
422 8 |
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
423 - 159dfc9fa5d3 |
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
424 4 |
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
425 - 725c380fe99b |
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
426 3 |
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
427 - 0d3f46688ccc |
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
428 1 |
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
429 - 7c3bad9141dc |
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
430 0 |
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
431 - 1f0dee641bb7 |
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
432 |
343 | 433 $ hg debugobsolete `getid 9` #kill |
80
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
434 $ 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
|
435 $ qlog |
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
436 8 |
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
437 - 159dfc9fa5d3 |
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
438 4 |
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
439 - 725c380fe99b |
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
440 3 |
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
441 - 0d3f46688ccc |
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
442 1 |
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
443 - 7c3bad9141dc |
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
444 0 |
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
445 - 1f0dee641bb7 |
5d029a358252
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
79
diff
changeset
|
446 |
473
1f8f8dd75d18
obsolete: prevent bare hg update to select hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
471
diff
changeset
|
447 Check that auto update ignore hidden changeset |
1f8f8dd75d18
obsolete: prevent bare hg update to select hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
471
diff
changeset
|
448 $ 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
|
449 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
|
450 $ 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
|
451 3 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
|
452 $ 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
|
453 8 |
1f8f8dd75d18
obsolete: prevent bare hg update to select hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
471
diff
changeset
|
454 |
480
cd1d5b7308be
obsolete: ignore hidden changeset when resolving `branchname` revision
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
479
diff
changeset
|
455 Check that named update do too |
cd1d5b7308be
obsolete: ignore hidden changeset when resolving `branchname` revision
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
479
diff
changeset
|
456 |
cd1d5b7308be
obsolete: ignore hidden changeset when resolving `branchname` revision
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
479
diff
changeset
|
457 $ 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
|
458 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
|
459 $ 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
|
460 8 |
cd1d5b7308be
obsolete: ignore hidden changeset when resolving `branchname` revision
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
479
diff
changeset
|
461 |
473
1f8f8dd75d18
obsolete: prevent bare hg update to select hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
471
diff
changeset
|
462 $ 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
|
463 |
150
f12fd2410a60
obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
144
diff
changeset
|
464 check rebase compat |
f12fd2410a60
obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
144
diff
changeset
|
465 |
572
dc107acd0bd2
adapt to core rebase support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
571
diff
changeset
|
466 $ 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
|
467 o 8 - 159dfc9fa5d3 add obsol_d'' |
150
f12fd2410a60
obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
144
diff
changeset
|
468 | |
572
dc107acd0bd2
adapt to core rebase support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
571
diff
changeset
|
469 | o 4 - 725c380fe99b add obsol_c' |
150
f12fd2410a60
obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
144
diff
changeset
|
470 | | |
572
dc107acd0bd2
adapt to core rebase support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
571
diff
changeset
|
471 x | 3 - 0d3f46688ccc add obsol_c |
150
f12fd2410a60
obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
144
diff
changeset
|
472 |/ |
572
dc107acd0bd2
adapt to core rebase support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
571
diff
changeset
|
473 o 1 - 7c3bad9141dc add b |
150
f12fd2410a60
obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
144
diff
changeset
|
474 | |
572
dc107acd0bd2
adapt to core rebase support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
571
diff
changeset
|
475 o 0 - 1f0dee641bb7 add a |
150
f12fd2410a60
obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
144
diff
changeset
|
476 |
f12fd2410a60
obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
144
diff
changeset
|
477 |
570
1c45a07dda51
test-obsolete: clean up useless inlined option
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
554
diff
changeset
|
478 $ hg log -G --template='{rev} - {node|short}\n' --hidden |
346
f4302a2079f4
tests: update graphlog output after hg@2e13c1bd34dc
Patrick Mezard <patrick@mezard.eu>
parents:
343
diff
changeset
|
479 x 9 - 83b5778897ad |
150
f12fd2410a60
obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
144
diff
changeset
|
480 |
f12fd2410a60
obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
144
diff
changeset
|
481 o 8 - 159dfc9fa5d3 |
f12fd2410a60
obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
144
diff
changeset
|
482 | |
346
f4302a2079f4
tests: update graphlog output after hg@2e13c1bd34dc
Patrick Mezard <patrick@mezard.eu>
parents:
343
diff
changeset
|
483 | x 7 - 909a0fb57e5d |
150
f12fd2410a60
obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
144
diff
changeset
|
484 |/ |
346
f4302a2079f4
tests: update graphlog output after hg@2e13c1bd34dc
Patrick Mezard <patrick@mezard.eu>
parents:
343
diff
changeset
|
485 | x 6 - 95de7fc6918d |
150
f12fd2410a60
obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
144
diff
changeset
|
486 |/ |
346
f4302a2079f4
tests: update graphlog output after hg@2e13c1bd34dc
Patrick Mezard <patrick@mezard.eu>
parents:
343
diff
changeset
|
487 | x 5 - a7a6f2b5d8a5 |
150
f12fd2410a60
obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
144
diff
changeset
|
488 |/ |
f12fd2410a60
obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
144
diff
changeset
|
489 | o 4 - 725c380fe99b |
f12fd2410a60
obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
144
diff
changeset
|
490 | | |
346
f4302a2079f4
tests: update graphlog output after hg@2e13c1bd34dc
Patrick Mezard <patrick@mezard.eu>
parents:
343
diff
changeset
|
491 x | 3 - 0d3f46688ccc |
150
f12fd2410a60
obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
144
diff
changeset
|
492 |/ |
346
f4302a2079f4
tests: update graphlog output after hg@2e13c1bd34dc
Patrick Mezard <patrick@mezard.eu>
parents:
343
diff
changeset
|
493 | x 2 - 4538525df7e2 |
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 o 1 - 7c3bad9141dc |
f12fd2410a60
obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
144
diff
changeset
|
496 | |
f12fd2410a60
obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
144
diff
changeset
|
497 o 0 - 1f0dee641bb7 |
f12fd2410a60
obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
144
diff
changeset
|
498 |
f12fd2410a60
obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
144
diff
changeset
|
499 |
f12fd2410a60
obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
144
diff
changeset
|
500 should not rebase extinct changeset |
f12fd2410a60
obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
144
diff
changeset
|
501 |
572
dc107acd0bd2
adapt to core rebase support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
571
diff
changeset
|
502 #excluded 'whole rebase set is extinct and ignored.' message not in core |
dc107acd0bd2
adapt to core rebase support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
571
diff
changeset
|
503 $ hg rebase -b '3' -d 4 --traceback |
586
f01721161532
evolve: rename conflicting into divergent
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
572
diff
changeset
|
504 2 new divergent changesets |
747
9300f48786de
test: prepare test for core changeset 9c78ed396075
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
745
diff
changeset
|
505 $ hg up tip |
9300f48786de
test: prepare test for core changeset 9c78ed396075
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
745
diff
changeset
|
506 ? 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
|
507 $ 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
|
508 @ 11 - 9468a5f5d8b2 add obsol_d'' |
150
f12fd2410a60
obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
144
diff
changeset
|
509 | |
572
dc107acd0bd2
adapt to core rebase support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
571
diff
changeset
|
510 o 10 - 2033b4e49474 add obsol_c |
150
f12fd2410a60
obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
144
diff
changeset
|
511 | |
572
dc107acd0bd2
adapt to core rebase support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
571
diff
changeset
|
512 o 4 - 725c380fe99b add obsol_c' |
150
f12fd2410a60
obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
144
diff
changeset
|
513 | |
572
dc107acd0bd2
adapt to core rebase support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
571
diff
changeset
|
514 o 1 - 7c3bad9141dc add b |
150
f12fd2410a60
obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
144
diff
changeset
|
515 | |
572
dc107acd0bd2
adapt to core rebase support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
571
diff
changeset
|
516 o 0 - 1f0dee641bb7 add a |
150
f12fd2410a60
obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
144
diff
changeset
|
517 |
f12fd2410a60
obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
144
diff
changeset
|
518 |
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
|
519 Does not complain about new head if you obsolete the old one |
756
64c6bdfd0518
evolve: use super for calling parent class method
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
750
diff
changeset
|
520 (re necesarry when we start runnind 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
|
521 |
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
|
522 $ 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
|
523 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
|
524 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
|
525 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
|
526 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
|
527 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
|
528 added 2 changesets with 1 changes to [12] files (re) |
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
|
529 $ 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
|
530 $ 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
|
531 created new head |
343 | 532 $ hg debugobsolete `getid 11` `getid 12` |
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
|
533 $ 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
|
534 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
|
535 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
|
536 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
|
537 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
|
538 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
|
539 added 1 changesets with 1 changes to 1 files (+1 heads) |
274
6622a24f3b0f
obsolete: fix rebase wrapping
Patrick Mezard <patrick@mezard.eu>
parents:
225
diff
changeset
|
540 $ cd .. |
307
9ac56d36d6ff
obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
306
diff
changeset
|
541 |
593
26f76b38f879
evolve: Rename latecomer into bumped
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
587
diff
changeset
|
542 check bumped detection |
307
9ac56d36d6ff
obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
306
diff
changeset
|
543 (make an obsolete changeset public) |
9ac56d36d6ff
obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
306
diff
changeset
|
544 |
9ac56d36d6ff
obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
306
diff
changeset
|
545 $ cd local |
625
e291e5271694
prepare for Full scale filtering !!!
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
594
diff
changeset
|
546 $ hg phase --hidden --public 11 |
593
26f76b38f879
evolve: Rename latecomer into bumped
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
587
diff
changeset
|
547 1 new bumped changesets |
570
1c45a07dda51
test-obsolete: clean up useless inlined option
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
554
diff
changeset
|
548 $ 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
|
549 @ 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
|
550 | |
9ac56d36d6ff
obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
306
diff
changeset
|
551 | 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
|
552 |/ |
9ac56d36d6ff
obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
306
diff
changeset
|
553 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
|
554 | |
9ac56d36d6ff
obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
306
diff
changeset
|
555 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
|
556 | |
9ac56d36d6ff
obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
306
diff
changeset
|
557 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
|
558 | |
9ac56d36d6ff
obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
306
diff
changeset
|
559 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
|
560 |
593
26f76b38f879
evolve: Rename latecomer into bumped
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
587
diff
changeset
|
561 $ hg log -r 'bumped()' |
307
9ac56d36d6ff
obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
306
diff
changeset
|
562 changeset: 12:6db5e282cb91 |
9ac56d36d6ff
obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
306
diff
changeset
|
563 tag: tip |
9ac56d36d6ff
obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
306
diff
changeset
|
564 parent: 10:2033b4e49474 |
9ac56d36d6ff
obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
306
diff
changeset
|
565 user: test |
9ac56d36d6ff
obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
306
diff
changeset
|
566 date: Thu Jan 01 00:00:00 1970 +0000 |
9ac56d36d6ff
obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
306
diff
changeset
|
567 summary: add obsol_d''' |
9ac56d36d6ff
obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
306
diff
changeset
|
568 |
308
23ef1c71d164
obsolete: detect late comer during push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
307
diff
changeset
|
569 $ hg push ../other-new/ |
23ef1c71d164
obsolete: detect late comer during push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
307
diff
changeset
|
570 pushing to ../other-new/ |
23ef1c71d164
obsolete: detect late comer during push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
307
diff
changeset
|
571 searching for changes |
590
02cadd3dc9f4
evolve: adapt to 2.4 code
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
587
diff
changeset
|
572 abort: push includes bumped changeset: 6db5e282cb91! |
492
7ecd41520dae
rename `stabilize` to `evolve`
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
491
diff
changeset
|
573 (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
|
574 [255] |
320
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
575 |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
576 Check hg commit --amend compat |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
577 |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
578 $ hg up 'desc(obsol_c)' |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
579 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
|
580 $ mkcommit f |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
581 created new head |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
582 $ echo 42 >> f |
554
39eb12bb47c0
commit --amend: adap to core 63e45aee46d4
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
583 $ 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
|
584 $ hg log -G |
590
02cadd3dc9f4
evolve: adapt to 2.4 code
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
587
diff
changeset
|
585 @ changeset: 15:705ab2a6b72e |
320
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
586 | tag: tip |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
587 | parent: 10:2033b4e49474 |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
588 | user: test |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
589 | 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
|
590 | summary: add f |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
591 | |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
592 | o changeset: 12:6db5e282cb91 |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
593 |/ parent: 10:2033b4e49474 |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
594 | user: test |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
595 | 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
|
596 | summary: add obsol_d''' |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
597 | |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
598 | o changeset: 11:9468a5f5d8b2 |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
599 |/ user: test |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
600 | 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
|
601 | summary: add obsol_d'' |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
602 | |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
603 o changeset: 10:2033b4e49474 |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
604 | parent: 4:725c380fe99b |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
605 | user: test |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
606 | 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
|
607 | summary: add obsol_c |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
608 | |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
609 o changeset: 4:725c380fe99b |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
610 | parent: 1:7c3bad9141dc |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
611 | user: test |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
612 | 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
|
613 | summary: add obsol_c' |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
614 | |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
615 o changeset: 1:7c3bad9141dc |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
616 | user: test |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
617 | 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
|
618 | summary: add b |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
619 | |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
620 o changeset: 0:1f0dee641bb7 |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
621 user: test |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
622 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
|
623 summary: add a |
63f267bd2176
obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
308
diff
changeset
|
624 |
554
39eb12bb47c0
commit --amend: adap to core 63e45aee46d4
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
625 $ hg debugobsolete | grep -v 33d458d86621f3186c40bfccd77652f4a122743e |
441
d702f0d26c6a
obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
421
diff
changeset
|
626 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 {'date': '', 'user': 'test'} (glob) |
d702f0d26c6a
obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
421
diff
changeset
|
627 0d3f46688ccc6e756c7e96cf64c391c411309597 725c380fe99b5e76613493f0903e8d11ddc70d54 0 {'date': '', 'user': 'test'} (glob) |
d702f0d26c6a
obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
421
diff
changeset
|
628 a7a6f2b5d8a54b81bc7aa2fba2934ad6d700a79e 95de7fc6918dea4c9c8d5382f50649794b474c4a 0 {'date': '', 'user': 'test'} (glob) |
d702f0d26c6a
obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
421
diff
changeset
|
629 95de7fc6918dea4c9c8d5382f50649794b474c4a 909a0fb57e5d909f353d89e394ffd7e0890fec88 0 {'date': '', 'user': 'test'} (glob) |
d702f0d26c6a
obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
421
diff
changeset
|
630 909a0fb57e5d909f353d89e394ffd7e0890fec88 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 0 {'date': '', 'user': 'test'} (glob) |
d702f0d26c6a
obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
421
diff
changeset
|
631 1f0dee641bb7258c56bd60e93edfa2405381c41e 83b5778897adafb967ef2f75be3aaa4fce49a4cc 0 {'date': '', 'user': 'test'} (glob) |
d702f0d26c6a
obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
421
diff
changeset
|
632 83b5778897adafb967ef2f75be3aaa4fce49a4cc 0 {'date': '', 'user': 'test'} (glob) |
455
f46a41006136
obsolete: simplify rebase wrapping code and change relation creation
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
441
diff
changeset
|
633 0d3f46688ccc6e756c7e96cf64c391c411309597 2033b4e494742365851fac84d276640cbf52833e 0 {'date': '* *', 'user': 'test'} (glob) |
441
d702f0d26c6a
obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
421
diff
changeset
|
634 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 9468a5f5d8b2c5d91e17474e95ae4791e9718fdf 0 {'date': '* *', 'user': 'test'} (glob) |
d702f0d26c6a
obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
421
diff
changeset
|
635 9468a5f5d8b2c5d91e17474e95ae4791e9718fdf 6db5e282cb91df5c43ff1f1287c119ff83230d42 0 {'date': '', 'user': 'test'} (glob) |
590
02cadd3dc9f4
evolve: adapt to 2.4 code
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
587
diff
changeset
|
636 0b1b6dd009c037985363e2290a0b579819f659db 705ab2a6b72e2cd86edb799ebe15f2695f86143e 0 {'date': '* *', 'user': 'test'} (glob) |
554
39eb12bb47c0
commit --amend: adap to core 63e45aee46d4
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
637 #no produced by 2.3 |
39eb12bb47c0
commit --amend: adap to core 63e45aee46d4
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
638 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
|
639 |
803
b96d51a357bd
test: get rid of all reference to conflicting changesets
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
763
diff
changeset
|
640 Check divergence detection |
354
bd26eb9714fb
obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
320
diff
changeset
|
641 |
bd26eb9714fb
obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
320
diff
changeset
|
642 $ hg up 9468a5f5d8b2 # add obsol_d'' |
bd26eb9714fb
obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
320
diff
changeset
|
643 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
|
644 $ mkcommit "obsolet_conflicting_d" |
bd26eb9714fb
obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
320
diff
changeset
|
645 $ hg summary |
554
39eb12bb47c0
commit --amend: adap to core 63e45aee46d4
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
646 parent: 1[46]:50f11e5e3a63 tip (re) |
354
bd26eb9714fb
obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
320
diff
changeset
|
647 add obsolet_conflicting_d |
bd26eb9714fb
obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
320
diff
changeset
|
648 branch: default |
bd26eb9714fb
obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
320
diff
changeset
|
649 commit: (clean) |
625
e291e5271694
prepare for Full scale filtering !!!
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
594
diff
changeset
|
650 update: (2|9|11) new changesets, (3|9|10) branch heads \(merge\) (re) |
593
26f76b38f879
evolve: Rename latecomer into bumped
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
587
diff
changeset
|
651 bumped: 1 changesets |
359
43f79983f638
merge with conflicting detection
Pierre-Yves David <pierre-yves.david@logilab.fr>
diff
changeset
|
652 $ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63` |
803
b96d51a357bd
test: get rid of all reference to conflicting changesets
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
763
diff
changeset
|
653 $ hg log -r 'divergent()' |
587
8152fedbac65
evolve: smarter code for divergent changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
586
diff
changeset
|
654 changeset: 12:6db5e282cb91 |
8152fedbac65
evolve: smarter code for divergent changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
586
diff
changeset
|
655 parent: 10:2033b4e49474 |
8152fedbac65
evolve: smarter code for divergent changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
586
diff
changeset
|
656 user: test |
8152fedbac65
evolve: smarter code for divergent changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
586
diff
changeset
|
657 date: Thu Jan 01 00:00:00 1970 +0000 |
8152fedbac65
evolve: smarter code for divergent changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
586
diff
changeset
|
658 summary: add obsol_d''' |
8152fedbac65
evolve: smarter code for divergent changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
586
diff
changeset
|
659 |
590
02cadd3dc9f4
evolve: adapt to 2.4 code
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
587
diff
changeset
|
660 changeset: 16:50f11e5e3a63 |
354
bd26eb9714fb
obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
320
diff
changeset
|
661 tag: tip |
bd26eb9714fb
obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
320
diff
changeset
|
662 parent: 11:9468a5f5d8b2 |
bd26eb9714fb
obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
320
diff
changeset
|
663 user: test |
bd26eb9714fb
obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
320
diff
changeset
|
664 date: Thu Jan 01 00:00:00 1970 +0000 |
bd26eb9714fb
obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
320
diff
changeset
|
665 summary: add obsolet_conflicting_d |
bd26eb9714fb
obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
320
diff
changeset
|
666 |
750
ddbea2fdee5e
evolve: allow updating to the successor if the parent is obsolete
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents:
747
diff
changeset
|
667 |
ddbea2fdee5e
evolve: allow updating to the successor if the parent is obsolete
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents:
747
diff
changeset
|
668 $ hg up --hidden 3 -q |
ddbea2fdee5e
evolve: allow updating to the successor if the parent is obsolete
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents:
747
diff
changeset
|
669 working directory parent is obsolete! |
ddbea2fdee5e
evolve: allow updating to the successor if the parent is obsolete
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents:
747
diff
changeset
|
670 $ 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
|
671 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
|
672 [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
|
673 [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
|
674 [2] |
ddbea2fdee5e
evolve: allow updating to the successor if the parent is obsolete
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents:
747
diff
changeset
|
675 $ hg olog |
ddbea2fdee5e
evolve: allow updating to the successor if the parent is obsolete
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents:
747
diff
changeset
|
676 changeset: 2:4538525df7e2 |
ddbea2fdee5e
evolve: allow updating to the successor if the parent is obsolete
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents:
747
diff
changeset
|
677 user: test |
ddbea2fdee5e
evolve: allow updating to the successor if the parent is obsolete
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents:
747
diff
changeset
|
678 date: Thu Jan 01 00:00:00 1970 +0000 |
ddbea2fdee5e
evolve: allow updating to the successor if the parent is obsolete
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents:
747
diff
changeset
|
679 summary: add c |
ddbea2fdee5e
evolve: allow updating to the successor if the parent is obsolete
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents:
747
diff
changeset
|
680 |
763
966e2659e989
import: warn about new unstable changesets
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents:
756
diff
changeset
|
681 |
966e2659e989
import: warn about new unstable changesets
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents:
756
diff
changeset
|
682 Check import reports new unstable changeset: |
966e2659e989
import: warn about new unstable changesets
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents:
756
diff
changeset
|
683 |
966e2659e989
import: warn about new unstable changesets
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents:
756
diff
changeset
|
684 $ hg up --hidden 2 |
966e2659e989
import: warn about new unstable changesets
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents:
756
diff
changeset
|
685 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
966e2659e989
import: warn about new unstable changesets
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents:
756
diff
changeset
|
686 working directory parent is obsolete! |
966e2659e989
import: warn about new unstable changesets
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents:
756
diff
changeset
|
687 $ hg export 9468a5f5d8b2 | hg import - |
966e2659e989
import: warn about new unstable changesets
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents:
756
diff
changeset
|
688 applying patch from stdin |
966e2659e989
import: warn about new unstable changesets
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents:
756
diff
changeset
|
689 1 new unstable changesets |
816
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
690 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
691 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
692 Relevant marker computation |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
693 ============================== |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
694 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
695 $ hg log -G --hidden |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
696 @ changeset: 17:a5f7a21fe7bc |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
697 | tag: tip |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
698 | parent: 2:4538525df7e2 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
699 | user: test |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
700 | 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
|
701 | summary: add obsol_d'' |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
702 | |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
703 | o changeset: 16:50f11e5e3a63 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
704 | | parent: 11:9468a5f5d8b2 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
705 | | user: test |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
706 | | 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
|
707 | | summary: add obsolet_conflicting_d |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
708 | | |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
709 | | o changeset: 15:705ab2a6b72e |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
710 | | | parent: 10:2033b4e49474 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
711 | | | user: test |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
712 | | | 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
|
713 | | | summary: add f |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
714 | | | |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
715 | | | x changeset: 14:33d458d86621 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
716 | | | | user: test |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
717 | | | | 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
|
718 | | | | 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
|
719 | | | | |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
720 | | | x changeset: 13:0b1b6dd009c0 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
721 | | |/ parent: 10:2033b4e49474 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
722 | | | user: test |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
723 | | | 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
|
724 | | | summary: add f |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
725 | | | |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
726 | | | o changeset: 12:6db5e282cb91 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
727 | | |/ parent: 10:2033b4e49474 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
728 | | | user: test |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
729 | | | 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
|
730 | | | summary: add obsol_d''' |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
731 | | | |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
732 | o | changeset: 11:9468a5f5d8b2 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
733 | |/ user: test |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
734 | | 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
|
735 | | summary: add obsol_d'' |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
736 | | |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
737 | o changeset: 10:2033b4e49474 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
738 | | parent: 4:725c380fe99b |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
739 | | user: test |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
740 | | 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
|
741 | | summary: add obsol_c |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
742 | | |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
743 | | x changeset: 9:83b5778897ad |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
744 | | parent: -1:000000000000 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
745 | | user: test |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
746 | | 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
|
747 | | summary: add toto |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
748 | | |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
749 | | x changeset: 8:159dfc9fa5d3 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
750 | | | parent: 3:0d3f46688ccc |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
751 | | | user: test |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
752 | | | 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
|
753 | | | summary: add obsol_d'' |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
754 | | | |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
755 | | | x changeset: 7:909a0fb57e5d |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
756 | | |/ parent: 3:0d3f46688ccc |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
757 | | | user: test |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
758 | | | 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
|
759 | | | summary: add obsol_d' |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
760 | | | |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
761 | | | x changeset: 6:95de7fc6918d |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
762 | | |/ parent: 3:0d3f46688ccc |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
763 | | | user: test |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
764 | | | 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
|
765 | | | summary: add obsol_d |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
766 | | | |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
767 | | | x changeset: 5:a7a6f2b5d8a5 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
768 | | |/ parent: 3:0d3f46688ccc |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
769 | | | user: test |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
770 | | | 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
|
771 | | | summary: add 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: 4:725c380fe99b |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
774 | | | parent: 1:7c3bad9141dc |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
775 | | | user: test |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
776 | | | 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
|
777 | | | summary: add obsol_c' |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
778 | | | |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
779 | | x changeset: 3:0d3f46688ccc |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
780 | |/ parent: 1:7c3bad9141dc |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
781 | | user: test |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
782 | | 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
|
783 | | summary: add obsol_c |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
784 | | |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
785 x | changeset: 2:4538525df7e2 |
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 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
788 | summary: add c |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
789 | |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
790 o changeset: 1:7c3bad9141dc |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
791 | user: test |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
792 | 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
|
793 | summary: add b |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
794 | |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
795 o changeset: 0:1f0dee641bb7 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
796 user: test |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
797 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
|
798 summary: add a |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
799 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
800 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
801 Simple rewrite |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
802 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
803 $ hg --hidden debugobsoleterelevant 3 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
804 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 {'date': '', 'user': 'test'} |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
805 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
806 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
|
807 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
808 $ hg debugobsoleterelevant 15 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
809 0b1b6dd009c037985363e2290a0b579819f659db 705ab2a6b72e2cd86edb799ebe15f2695f86143e 0 {'date': '* *', 'user': 'test'} (glob) |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
810 33d458d86621f3186c40bfccd77652f4a122743e 0 {'date': '* *', 'p1': '0b1b6dd009c037985363e2290a0b579819f659db', 'user': 'test'} (glob) |
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 Transitive rewrite |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
813 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
814 $ hg --hidden debugobsoleterelevant 8 |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
815 909a0fb57e5d909f353d89e394ffd7e0890fec88 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 0 {'date': '', 'user': 'test'} |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
816 95de7fc6918dea4c9c8d5382f50649794b474c4a 909a0fb57e5d909f353d89e394ffd7e0890fec88 0 {'date': '', 'user': 'test'} |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
817 a7a6f2b5d8a54b81bc7aa2fba2934ad6d700a79e 95de7fc6918dea4c9c8d5382f50649794b474c4a 0 {'date': '', 'user': 'test'} |
03587920dfd9
evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
803
diff
changeset
|
818 |