annotate tests/test-obsolete.t @ 880:7fe06f32d1ad

exchange: fix push markers over wire protocol for http peer Http actually interpret the data passed to _callpush expecting them to a bundle. Interpretation of a markers stream as a bundle obviously led to crash.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Mon, 10 Mar 2014 21:57:41 -0700
parents 9aa20585e158
children 010c7e4aa820
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
6b92f8d5ae58 adapt for new mercurial
Pierre-Yves.David@ens-lyon.org
parents: 320
diff changeset
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
6b92f8d5ae58 adapt for new mercurial
Pierre-Yves.David@ens-lyon.org
parents: 320
diff changeset
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
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 32
diff changeset
21 $ hg init local
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 32
diff changeset
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
6b92f8d5ae58 adapt for new mercurial
Pierre-Yves.David@ens-lyon.org
parents: 320
diff changeset
31 $ getid 2
6b92f8d5ae58 adapt for new mercurial
Pierre-Yves.David@ens-lyon.org
parents: 320
diff changeset
32 4538525df7e2b9f09423636c61ef63a4cb872a2d
6b92f8d5ae58 adapt for new mercurial
Pierre-Yves.David@ens-lyon.org
parents: 320
diff changeset
33 $ getid 3
6b92f8d5ae58 adapt for new mercurial
Pierre-Yves.David@ens-lyon.org
parents: 320
diff changeset
34 0d3f46688ccc6e756c7e96cf64c391c411309597
6b92f8d5ae58 adapt for new mercurial
Pierre-Yves.David@ens-lyon.org
parents: 320
diff changeset
35 $ hg debugobsolete 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597
6b92f8d5ae58 adapt for new mercurial
Pierre-Yves.David@ens-lyon.org
parents: 320
diff changeset
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
6b92f8d5ae58 adapt for new mercurial
Pierre-Yves.David@ens-lyon.org
parents: 320
diff changeset
38
39
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 32
diff changeset
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
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 32
diff changeset
45
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 32
diff changeset
46 Test that obsolete changeset are hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 32
diff changeset
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
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 32
diff changeset
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
6b92f8d5ae58 adapt for new mercurial
Pierre-Yves.David@ens-lyon.org
parents: 320
diff changeset
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
2111c655b4f5 fix typo
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 480
diff changeset
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)
817
c2bf0eb727f1 exchange: only push the set of marker relevant to want we push
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 816
diff changeset
184 OBSEXC: computing relevant nodes
c2bf0eb727f1 exchange: only push the set of marker relevant to want we push
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 816
diff changeset
185 OBSEXC: computing markers relevant to 5 nodes
c2bf0eb727f1 exchange: only push the set of marker relevant to want we push
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 816
diff changeset
186 OBSEXC: encoding 2 markers
c2bf0eb727f1 exchange: only push the set of marker relevant to want we push
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 816
diff changeset
187 OBSEXC: sending 1 pushkey payload (154 bytes)
c2bf0eb727f1 exchange: only push the set of marker relevant to want we push
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 816
diff changeset
188 OBSEXC: DONE
215
0eceb5a48485 obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 214
diff changeset
189 $ hg -R ../other-new verify
0eceb5a48485 obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 214
diff changeset
190 checking changesets
0eceb5a48485 obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 214
diff changeset
191 checking manifests
0eceb5a48485 obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 214
diff changeset
192 crosschecking files in changesets and manifests
0eceb5a48485 obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 214
diff changeset
193 checking files
0eceb5a48485 obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 214
diff changeset
194 5 files, 5 changesets, 5 total revisions
45
d89453a10991 include hash in test.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 44
diff changeset
195 $ qlog -R ../other-new -r 'obsolete()'
49
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
196 2
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
197 - 0d3f46688ccc
45
d89453a10991 include hash in test.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 44
diff changeset
198 $ qlog -R ../other-new
49
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
199 4
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
200 - a7a6f2b5d8a5
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
201 3
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
202 - 725c380fe99b
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
203 2
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
204 - 0d3f46688ccc
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
205 1
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
206 - 7c3bad9141dc
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
207 0
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
208 - 1f0dee641bb7
625
e291e5271694 prepare for Full scale filtering !!!
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 594
diff changeset
209 $ hg up --hidden 3 -q
743
af74a5cdf96b conform to the Mercurial custom of lowercase messages
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 652
diff changeset
210 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
211 $ mkcommit obsol_d # 6
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
212 created new head
486
2111c655b4f5 fix typo
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 480
diff changeset
213 1 new unstable changesets
343
6b92f8d5ae58 adapt for new mercurial
Pierre-Yves.David@ens-lyon.org
parents: 320
diff changeset
214 $ 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
215 $ qlog
49
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
216 6
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
217 - 95de7fc6918d
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
218 4
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
219 - 725c380fe99b
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
220 3
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
221 - 0d3f46688ccc
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
222 1
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
223 - 7c3bad9141dc
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
224 0
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
225 - 1f0dee641bb7
44
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
226 $ qlog -r 'obsolete()'
49
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
227 3
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
228 - 0d3f46688ccc
217
786eb34d93ea obsolete: refuse to push unstable changeset without -f
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 215
diff changeset
229 $ 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
230 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
231 searching for changes
590
02cadd3dc9f4 evolve: adapt to 2.4 code
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 587
diff changeset
232 abort: push includes unstable changeset: 95de7fc6918d!
492
7ecd41520dae rename `stabilize` to `evolve`
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 491
diff changeset
233 (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
234 [255]
786eb34d93ea obsolete: refuse to push unstable changeset without -f
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 215
diff changeset
235 $ 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
236 pushing to ../other-new
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
237 searching for changes
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
238 adding changesets
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
239 adding manifests
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
240 adding file changes
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
241 added 1 changesets with 1 changes to 1 files (+1 heads)
817
c2bf0eb727f1 exchange: only push the set of marker relevant to want we push
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 816
diff changeset
242 OBSEXC: computing relevant nodes
c2bf0eb727f1 exchange: only push the set of marker relevant to want we push
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 816
diff changeset
243 OBSEXC: computing markers relevant to 5 nodes
c2bf0eb727f1 exchange: only push the set of marker relevant to want we push
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 816
diff changeset
244 OBSEXC: encoding 3 markers
c2bf0eb727f1 exchange: only push the set of marker relevant to want we push
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 816
diff changeset
245 OBSEXC: sending 1 pushkey payload (230 bytes)
c2bf0eb727f1 exchange: only push the set of marker relevant to want we push
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 816
diff changeset
246 OBSEXC: DONE
44
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
247 $ qlog -R ../other-new
49
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
248 5
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
249 - 95de7fc6918d
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
250 3
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
251 - 725c380fe99b
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
252 2
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
253 - 0d3f46688ccc
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
254 1
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
255 - 7c3bad9141dc
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
256 0
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
257 - 1f0dee641bb7
44
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
258 $ qlog -R ../other-new -r 'obsolete()'
49
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
259 2
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
260 - 0d3f46688ccc
214
a140d1857931 obsolete: do not warn about unpushed extinct changeset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 206
diff changeset
261
a140d1857931 obsolete: do not warn about unpushed extinct changeset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 206
diff changeset
262 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
263
a140d1857931 obsolete: do not warn about unpushed extinct changeset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 206
diff changeset
264 $ 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
265 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
266 searching for changes
385
cdcdedc532b7 obsolete: Stop turning obsolete secret changesets secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 381
diff changeset
267 no changes found
817
c2bf0eb727f1 exchange: only push the set of marker relevant to want we push
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 816
diff changeset
268 OBSEXC: computing relevant nodes
c2bf0eb727f1 exchange: only push the set of marker relevant to want we push
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 816
diff changeset
269 OBSEXC: computing markers relevant to 5 nodes
c2bf0eb727f1 exchange: only push the set of marker relevant to want we push
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 816
diff changeset
270 OBSEXC: encoding 3 markers
c2bf0eb727f1 exchange: only push the set of marker relevant to want we push
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 816
diff changeset
271 OBSEXC: sending 1 pushkey payload (230 bytes)
c2bf0eb727f1 exchange: only push the set of marker relevant to want we push
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 816
diff changeset
272 OBSEXC: DONE
214
a140d1857931 obsolete: do not warn about unpushed extinct changeset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 206
diff changeset
273 [1]
a140d1857931 obsolete: do not warn about unpushed extinct changeset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 206
diff changeset
274
625
e291e5271694 prepare for Full scale filtering !!!
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 594
diff changeset
275 $ 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
276 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
277 $ mkcommit "obsol_d'" # 7
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
278 created new head
486
2111c655b4f5 fix typo
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 480
diff changeset
279 1 new unstable changesets
343
6b92f8d5ae58 adapt for new mercurial
Pierre-Yves.David@ens-lyon.org
parents: 320
diff changeset
280 $ 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
281 $ 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
282 pulling from .
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
283 searching for changes
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
284 adding changesets
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
285 adding manifests
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
286 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
287 added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
823
9aa20585e158 exchange: add a new method to pull markers
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 817
diff changeset
288 OBSEXC: pull obsolescence markers
9aa20585e158 exchange: add a new method to pull markers
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 817
diff changeset
289 OBSEXC: merging obsolescence markers (245 bytes)
9aa20585e158 exchange: add a new method to pull markers
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 817
diff changeset
290 OBSEXC: 1 markers added
9aa20585e158 exchange: add a new method to pull markers
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 817
diff changeset
291 OBSEXC: DONE
9aa20585e158 exchange: add a new method to pull markers
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 817
diff changeset
292 (run 'hg heads' to see heads, 'hg merge' to merge)
44
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
293 $ 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
294 6
49
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
295 - 909a0fb57e5d
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
296 3
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
297 - 725c380fe99b
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
298 2
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
299 - 0d3f46688ccc
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
300 1
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
301 - 7c3bad9141dc
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
302 0
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
303 - 1f0dee641bb7
46
3b0364fc822f Do not propagate obsolete changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 45
diff changeset
304
3b0364fc822f Do not propagate obsolete changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 45
diff changeset
305 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
306
405
b5b1bf5166a2 obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 398
diff changeset
307 DISABLED. the _enable switch it global :-/
b5b1bf5166a2 obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 398
diff changeset
308
b5b1bf5166a2 obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 398
diff changeset
309 .. $ hg init ../other-old
b5b1bf5166a2 obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 398
diff changeset
310 .. > # 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
311 .. > # 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
312 .. $ echo '[extensions]' > ../other-old/.hg/hgrc
b5b1bf5166a2 obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 398
diff changeset
313 .. $ 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
314 .. $ hg push ../other-old
b5b1bf5166a2 obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 398
diff changeset
315 .. pushing to ../other-old
b5b1bf5166a2 obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 398
diff changeset
316 .. searching for changes
b5b1bf5166a2 obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 398
diff changeset
317 .. 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
318 .. (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
319 .. [255]
b5b1bf5166a2 obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 398
diff changeset
320 .. $ hg push -f ../other-old
b5b1bf5166a2 obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 398
diff changeset
321 .. pushing to ../other-old
b5b1bf5166a2 obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 398
diff changeset
322 .. searching for changes
b5b1bf5166a2 obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 398
diff changeset
323 .. adding changesets
b5b1bf5166a2 obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 398
diff changeset
324 .. adding manifests
b5b1bf5166a2 obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 398
diff changeset
325 .. adding file changes
b5b1bf5166a2 obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 398
diff changeset
326 .. 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
327 .. $ qlog -R ../other-ol
b5b1bf5166a2 obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 398
diff changeset
328 .. 4
b5b1bf5166a2 obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 398
diff changeset
329 .. - 909a0fb57e5d
b5b1bf5166a2 obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 398
diff changeset
330 .. 3
b5b1bf5166a2 obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 398
diff changeset
331 .. - 725c380fe99b
b5b1bf5166a2 obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 398
diff changeset
332 .. 2
b5b1bf5166a2 obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 398
diff changeset
333 .. - 0d3f46688ccc
b5b1bf5166a2 obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 398
diff changeset
334 .. 1
b5b1bf5166a2 obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 398
diff changeset
335 .. - 7c3bad9141dc
b5b1bf5166a2 obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 398
diff changeset
336 .. 0
b5b1bf5166a2 obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 398
diff changeset
337 .. - 1f0dee641bb7
44
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
338
50
19b22ad56b32 clone support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 49
diff changeset
339 clone support
44
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
340
50
19b22ad56b32 clone support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 49
diff changeset
341 $ 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
342 > # 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
343 updating to branch default
19b22ad56b32 clone support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 49
diff changeset
344 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
345
389
cb575242d2ba test-obsolete: handle local clones copying obsolete markers
Patrick Mezard <patrick@mezard.eu>
parents: 385
diff changeset
346 $ 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
347 7
cdcdedc532b7 obsolete: Stop turning obsolete secret changesets secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 381
diff changeset
348 - 909a0fb57e5d
cdcdedc532b7 obsolete: Stop turning obsolete secret changesets secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 381
diff changeset
349 6
cdcdedc532b7 obsolete: Stop turning obsolete secret changesets secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 381
diff changeset
350 - 95de7fc6918d
cdcdedc532b7 obsolete: Stop turning obsolete secret changesets secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 381
diff changeset
351 5
cdcdedc532b7 obsolete: Stop turning obsolete secret changesets secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 381
diff changeset
352 - a7a6f2b5d8a5
135
1a08daef8a53 obsolete: add revset for various error case
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 112
diff changeset
353 4
385
cdcdedc532b7 obsolete: Stop turning obsolete secret changesets secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 381
diff changeset
354 - 725c380fe99b
135
1a08daef8a53 obsolete: add revset for various error case
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 112
diff changeset
355 3
385
cdcdedc532b7 obsolete: Stop turning obsolete secret changesets secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 381
diff changeset
356 - 0d3f46688ccc
135
1a08daef8a53 obsolete: add revset for various error case
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 112
diff changeset
357 2
385
cdcdedc532b7 obsolete: Stop turning obsolete secret changesets secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 381
diff changeset
358 - 4538525df7e2
50
19b22ad56b32 clone support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 49
diff changeset
359 1
19b22ad56b32 clone support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 49
diff changeset
360 - 7c3bad9141dc
19b22ad56b32 clone support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 49
diff changeset
361 0
19b22ad56b32 clone support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 49
diff changeset
362 - 1f0dee641bb7
19b22ad56b32 clone support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 49
diff changeset
363
52
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
364 Test rollback support
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
365
625
e291e5271694 prepare for Full scale filtering !!!
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 594
diff changeset
366 $ 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
367 working directory parent is obsolete!
52
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
368 $ mkcommit "obsol_d''"
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
369 created new head
486
2111c655b4f5 fix typo
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 480
diff changeset
370 1 new unstable changesets
343
6b92f8d5ae58 adapt for new mercurial
Pierre-Yves.David@ens-lyon.org
parents: 320
diff changeset
371 $ hg debugobsolete `getid 7` `getid 8`
215
0eceb5a48485 obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 214
diff changeset
372 $ cd ../other-new
0eceb5a48485 obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 214
diff changeset
373 $ hg up -q 3
0eceb5a48485 obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 214
diff changeset
374 $ hg pull ../local/
0eceb5a48485 obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 214
diff changeset
375 pulling from ../local/
52
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
376 searching for changes
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
377 adding changesets
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
378 adding manifests
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
379 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
380 added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
823
9aa20585e158 exchange: add a new method to pull markers
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 817
diff changeset
381 OBSEXC: pull obsolescence markers
9aa20585e158 exchange: add a new method to pull markers
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 817
diff changeset
382 OBSEXC: merging obsolescence markers (306 bytes)
9aa20585e158 exchange: add a new method to pull markers
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 817
diff changeset
383 OBSEXC: 1 markers added
9aa20585e158 exchange: add a new method to pull markers
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 817
diff changeset
384 OBSEXC: DONE
9aa20585e158 exchange: add a new method to pull markers
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 817
diff changeset
385 (run 'hg heads' to see heads, 'hg merge' to merge)
52
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
386
215
0eceb5a48485 obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 214
diff changeset
387 $ 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
388 $ qlog
135
1a08daef8a53 obsolete: add revset for various error case
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 112
diff changeset
389 7
52
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
390 - 159dfc9fa5d3
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
391 3
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
392 - 725c380fe99b
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
393 2
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
394 - 0d3f46688ccc
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
395 1
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
396 - 7c3bad9141dc
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
397 0
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
398 - 1f0dee641bb7
215
0eceb5a48485 obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 214
diff changeset
399 $ hg rollback
135
1a08daef8a53 obsolete: add revset for various error case
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 112
diff changeset
400 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
401 working directory now based on revision 3
0eceb5a48485 obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 214
diff changeset
402 $ hg summary
0eceb5a48485 obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 214
diff changeset
403 parent: 3:725c380fe99b
0eceb5a48485 obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 214
diff changeset
404 add obsol_c'
0eceb5a48485 obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 214
diff changeset
405 branch: default
0eceb5a48485 obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 214
diff changeset
406 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
407 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
408 unstable: 1 changesets
215
0eceb5a48485 obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 214
diff changeset
409 $ qlog
135
1a08daef8a53 obsolete: add revset for various error case
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 112
diff changeset
410 6
52
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
411 - 909a0fb57e5d
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
412 3
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
413 - 725c380fe99b
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
414 2
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
415 - 0d3f46688ccc
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
416 1
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
417 - 7c3bad9141dc
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
418 0
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
419 - 1f0dee641bb7
215
0eceb5a48485 obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 214
diff changeset
420 $ cd ../local
52
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
421
112
eae9be0ee00e adapt obsolete to phase.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 98
diff changeset
422 obsolete public changeset
eae9be0ee00e adapt obsolete to phase.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 98
diff changeset
423
eae9be0ee00e adapt obsolete to phase.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 98
diff changeset
424 # move draft boundary from 0 to 1
eae9be0ee00e adapt obsolete to phase.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 98
diff changeset
425 $ 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
426
d7b11772f0b5 [obsolete] published changeset can't be obsoleted
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 52
diff changeset
427 $ hg up null
d7b11772f0b5 [obsolete] published changeset can't be obsoleted
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 52
diff changeset
428 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
429 $ 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
430 created new head
80
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
431 $ hg id -n
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
432 9
343
6b92f8d5ae58 adapt for new mercurial
Pierre-Yves.David@ens-lyon.org
parents: 320
diff changeset
433 $ hg debugobsolete `getid 0` `getid 9`
6b92f8d5ae58 adapt for new mercurial
Pierre-Yves.David@ens-lyon.org
parents: 320
diff changeset
434 83b5778897ad try to obsolete immutable changeset 1f0dee641bb7
6b92f8d5ae58 adapt for new mercurial
Pierre-Yves.David@ens-lyon.org
parents: 320
diff changeset
435 # 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
436 # 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
437 $ qlog -r 'obsolete()'
d7b11772f0b5 [obsolete] published changeset can't be obsoleted
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 52
diff changeset
438 3
d7b11772f0b5 [obsolete] published changeset can't be obsoleted
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 52
diff changeset
439 - 0d3f46688ccc
80
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
440 allow to just kill changeset
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
441
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
442 $ qlog
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
443 9
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
444 - 83b5778897ad
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
445 8
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
446 - 159dfc9fa5d3
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
447 4
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
448 - 725c380fe99b
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
449 3
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
450 - 0d3f46688ccc
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
451 1
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
452 - 7c3bad9141dc
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
453 0
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
454 - 1f0dee641bb7
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
455
343
6b92f8d5ae58 adapt for new mercurial
Pierre-Yves.David@ens-lyon.org
parents: 320
diff changeset
456 $ hg debugobsolete `getid 9` #kill
80
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
457 $ 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
458 $ qlog
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
459 8
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
460 - 159dfc9fa5d3
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
461 4
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
462 - 725c380fe99b
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
463 3
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
464 - 0d3f46688ccc
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
465 1
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
466 - 7c3bad9141dc
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
467 0
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
468 - 1f0dee641bb7
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
469
473
1f8f8dd75d18 obsolete: prevent bare hg update to select hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 471
diff changeset
470 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
471 $ 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
472 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
473 $ 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
474 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
475 $ 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
476 8
1f8f8dd75d18 obsolete: prevent bare hg update to select hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 471
diff changeset
477
480
cd1d5b7308be obsolete: ignore hidden changeset when resolving `branchname` revision
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 479
diff changeset
478 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
479
cd1d5b7308be obsolete: ignore hidden changeset when resolving `branchname` revision
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 479
diff changeset
480 $ 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
481 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
482 $ 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
483 8
cd1d5b7308be obsolete: ignore hidden changeset when resolving `branchname` revision
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 479
diff changeset
484
473
1f8f8dd75d18 obsolete: prevent bare hg update to select hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 471
diff changeset
485 $ 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
486
150
f12fd2410a60 obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 144
diff changeset
487 check rebase compat
f12fd2410a60 obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 144
diff changeset
488
572
dc107acd0bd2 adapt to core rebase support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 571
diff changeset
489 $ 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
490 o 8 - 159dfc9fa5d3 add obsol_d''
150
f12fd2410a60 obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 144
diff changeset
491 |
572
dc107acd0bd2 adapt to core rebase support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 571
diff changeset
492 | o 4 - 725c380fe99b add obsol_c'
150
f12fd2410a60 obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 144
diff changeset
493 | |
572
dc107acd0bd2 adapt to core rebase support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 571
diff changeset
494 x | 3 - 0d3f46688ccc add obsol_c
150
f12fd2410a60 obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 144
diff changeset
495 |/
572
dc107acd0bd2 adapt to core rebase support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 571
diff changeset
496 o 1 - 7c3bad9141dc add b
150
f12fd2410a60 obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 144
diff changeset
497 |
572
dc107acd0bd2 adapt to core rebase support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 571
diff changeset
498 o 0 - 1f0dee641bb7 add a
150
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
570
1c45a07dda51 test-obsolete: clean up useless inlined option
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 554
diff changeset
501 $ 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
502 x 9 - 83b5778897ad
150
f12fd2410a60 obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 144
diff changeset
503
f12fd2410a60 obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 144
diff changeset
504 o 8 - 159dfc9fa5d3
f12fd2410a60 obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 144
diff changeset
505 |
346
f4302a2079f4 tests: update graphlog output after hg@2e13c1bd34dc
Patrick Mezard <patrick@mezard.eu>
parents: 343
diff changeset
506 | x 7 - 909a0fb57e5d
150
f12fd2410a60 obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 144
diff changeset
507 |/
346
f4302a2079f4 tests: update graphlog output after hg@2e13c1bd34dc
Patrick Mezard <patrick@mezard.eu>
parents: 343
diff changeset
508 | x 6 - 95de7fc6918d
150
f12fd2410a60 obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 144
diff changeset
509 |/
346
f4302a2079f4 tests: update graphlog output after hg@2e13c1bd34dc
Patrick Mezard <patrick@mezard.eu>
parents: 343
diff changeset
510 | x 5 - a7a6f2b5d8a5
150
f12fd2410a60 obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 144
diff changeset
511 |/
f12fd2410a60 obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 144
diff changeset
512 | o 4 - 725c380fe99b
f12fd2410a60 obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 144
diff changeset
513 | |
346
f4302a2079f4 tests: update graphlog output after hg@2e13c1bd34dc
Patrick Mezard <patrick@mezard.eu>
parents: 343
diff changeset
514 x | 3 - 0d3f46688ccc
150
f12fd2410a60 obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 144
diff changeset
515 |/
346
f4302a2079f4 tests: update graphlog output after hg@2e13c1bd34dc
Patrick Mezard <patrick@mezard.eu>
parents: 343
diff changeset
516 | x 2 - 4538525df7e2
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 o 1 - 7c3bad9141dc
f12fd2410a60 obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 144
diff changeset
519 |
f12fd2410a60 obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 144
diff changeset
520 o 0 - 1f0dee641bb7
f12fd2410a60 obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 144
diff changeset
521
f12fd2410a60 obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 144
diff changeset
522
f12fd2410a60 obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 144
diff changeset
523 should not rebase extinct changeset
f12fd2410a60 obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 144
diff changeset
524
572
dc107acd0bd2 adapt to core rebase support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 571
diff changeset
525 #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
526 $ 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
527 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
528 $ hg up tip
9300f48786de test: prepare test for core changeset 9c78ed396075
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 745
diff changeset
529 ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob)
572
dc107acd0bd2 adapt to core rebase support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 571
diff changeset
530 $ hg log -G --template='{rev} - {node|short} {desc}\n'
dc107acd0bd2 adapt to core rebase support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 571
diff changeset
531 @ 11 - 9468a5f5d8b2 add obsol_d''
150
f12fd2410a60 obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 144
diff changeset
532 |
572
dc107acd0bd2 adapt to core rebase support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 571
diff changeset
533 o 10 - 2033b4e49474 add obsol_c
150
f12fd2410a60 obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 144
diff changeset
534 |
572
dc107acd0bd2 adapt to core rebase support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 571
diff changeset
535 o 4 - 725c380fe99b add obsol_c'
150
f12fd2410a60 obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 144
diff changeset
536 |
572
dc107acd0bd2 adapt to core rebase support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 571
diff changeset
537 o 1 - 7c3bad9141dc add b
150
f12fd2410a60 obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 144
diff changeset
538 |
572
dc107acd0bd2 adapt to core rebase support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 571
diff changeset
539 o 0 - 1f0dee641bb7 add a
150
f12fd2410a60 obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 144
diff changeset
540
f12fd2410a60 obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 144
diff changeset
541
218
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 217
diff changeset
542 Does not complain about new head if you obsolete the old one
756
64c6bdfd0518 evolve: use super for calling parent class method
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 750
diff changeset
543 (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
544
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 217
diff changeset
545 $ hg push ../other-new --traceback
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 217
diff changeset
546 pushing to ../other-new
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 217
diff changeset
547 searching for changes
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 217
diff changeset
548 adding changesets
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 217
diff changeset
549 adding manifests
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 217
diff changeset
550 adding file changes
756
64c6bdfd0518 evolve: use super for calling parent class method
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 750
diff changeset
551 added 2 changesets with 1 changes to [12] files (re)
817
c2bf0eb727f1 exchange: only push the set of marker relevant to want we push
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 816
diff changeset
552 OBSEXC: computing relevant nodes
c2bf0eb727f1 exchange: only push the set of marker relevant to want we push
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 816
diff changeset
553 OBSEXC: computing markers relevant to 5 nodes
c2bf0eb727f1 exchange: only push the set of marker relevant to want we push
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 816
diff changeset
554 OBSEXC: encoding 7 markers
c2bf0eb727f1 exchange: only push the set of marker relevant to want we push
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 816
diff changeset
555 OBSEXC: sending 1 pushkey payload (565 bytes)
c2bf0eb727f1 exchange: only push the set of marker relevant to want we push
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 816
diff changeset
556 OBSEXC: DONE
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
557 $ 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
558 $ 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
559 created new head
343
6b92f8d5ae58 adapt for new mercurial
Pierre-Yves.David@ens-lyon.org
parents: 320
diff changeset
560 $ 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
561 $ 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
562 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
563 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
564 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
565 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
566 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
567 added 1 changesets with 1 changes to 1 files (+1 heads)
817
c2bf0eb727f1 exchange: only push the set of marker relevant to want we push
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 816
diff changeset
568 OBSEXC: computing relevant nodes
c2bf0eb727f1 exchange: only push the set of marker relevant to want we push
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 816
diff changeset
569 OBSEXC: computing markers relevant to 5 nodes
c2bf0eb727f1 exchange: only push the set of marker relevant to want we push
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 816
diff changeset
570 OBSEXC: encoding 8 markers
c2bf0eb727f1 exchange: only push the set of marker relevant to want we push
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 816
diff changeset
571 OBSEXC: sending 1 pushkey payload (642 bytes)
c2bf0eb727f1 exchange: only push the set of marker relevant to want we push
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 816
diff changeset
572 OBSEXC: DONE
274
6622a24f3b0f obsolete: fix rebase wrapping
Patrick Mezard <patrick@mezard.eu>
parents: 225
diff changeset
573 $ cd ..
307
9ac56d36d6ff obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 306
diff changeset
574
593
26f76b38f879 evolve: Rename latecomer into bumped
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 587
diff changeset
575 check bumped detection
307
9ac56d36d6ff obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 306
diff changeset
576 (make an obsolete changeset public)
9ac56d36d6ff obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 306
diff changeset
577
9ac56d36d6ff obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 306
diff changeset
578 $ cd local
625
e291e5271694 prepare for Full scale filtering !!!
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 594
diff changeset
579 $ hg phase --hidden --public 11
593
26f76b38f879 evolve: Rename latecomer into bumped
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 587
diff changeset
580 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
581 $ 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
582 @ 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
583 |
9ac56d36d6ff obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 306
diff changeset
584 | 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
585 |/
9ac56d36d6ff obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 306
diff changeset
586 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
587 |
9ac56d36d6ff obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 306
diff changeset
588 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
589 |
9ac56d36d6ff obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 306
diff changeset
590 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
591 |
9ac56d36d6ff obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 306
diff changeset
592 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
593
593
26f76b38f879 evolve: Rename latecomer into bumped
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 587
diff changeset
594 $ hg log -r 'bumped()'
307
9ac56d36d6ff obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 306
diff changeset
595 changeset: 12:6db5e282cb91
9ac56d36d6ff obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 306
diff changeset
596 tag: tip
9ac56d36d6ff obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 306
diff changeset
597 parent: 10:2033b4e49474
9ac56d36d6ff obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 306
diff changeset
598 user: test
9ac56d36d6ff obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 306
diff changeset
599 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
600 summary: add obsol_d'''
9ac56d36d6ff obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 306
diff changeset
601
308
23ef1c71d164 obsolete: detect late comer during push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 307
diff changeset
602 $ hg push ../other-new/
23ef1c71d164 obsolete: detect late comer during push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 307
diff changeset
603 pushing to ../other-new/
23ef1c71d164 obsolete: detect late comer during push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 307
diff changeset
604 searching for changes
590
02cadd3dc9f4 evolve: adapt to 2.4 code
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 587
diff changeset
605 abort: push includes bumped changeset: 6db5e282cb91!
492
7ecd41520dae rename `stabilize` to `evolve`
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 491
diff changeset
606 (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
607 [255]
320
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 Check hg commit --amend compat
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
610
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
611 $ hg up 'desc(obsol_c)'
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
612 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
613 $ mkcommit f
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
614 created new head
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
615 $ echo 42 >> f
554
39eb12bb47c0 commit --amend: adap to core 63e45aee46d4
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 492
diff changeset
616 $ 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
617 $ hg log -G
590
02cadd3dc9f4 evolve: adapt to 2.4 code
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 587
diff changeset
618 @ changeset: 15:705ab2a6b72e
320
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
619 | tag: tip
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
620 | parent: 10:2033b4e49474
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 f
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
624 |
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
625 | o changeset: 12:6db5e282cb91
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
626 |/ parent: 10:2033b4e49474
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
627 | user: test
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
628 | 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
629 | summary: add obsol_d'''
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
630 |
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
631 | o changeset: 11:9468a5f5d8b2
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
632 |/ user: test
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
633 | 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
634 | summary: add obsol_d''
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
635 |
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
636 o changeset: 10:2033b4e49474
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
637 | parent: 4:725c380fe99b
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
638 | user: test
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
639 | 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
640 | summary: add obsol_c
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
641 |
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
642 o changeset: 4:725c380fe99b
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
643 | parent: 1:7c3bad9141dc
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
644 | user: test
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
645 | 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
646 | summary: add obsol_c'
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
647 |
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
648 o changeset: 1:7c3bad9141dc
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
649 | user: test
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
650 | 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
651 | summary: add b
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
652 |
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
653 o changeset: 0:1f0dee641bb7
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
654 user: test
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
655 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
656 summary: add a
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
657
554
39eb12bb47c0 commit --amend: adap to core 63e45aee46d4
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 492
diff changeset
658 $ hg debugobsolete | grep -v 33d458d86621f3186c40bfccd77652f4a122743e
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 421
diff changeset
659 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 {'date': '', 'user': 'test'} (glob)
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 421
diff changeset
660 0d3f46688ccc6e756c7e96cf64c391c411309597 725c380fe99b5e76613493f0903e8d11ddc70d54 0 {'date': '', 'user': 'test'} (glob)
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 421
diff changeset
661 a7a6f2b5d8a54b81bc7aa2fba2934ad6d700a79e 95de7fc6918dea4c9c8d5382f50649794b474c4a 0 {'date': '', 'user': 'test'} (glob)
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 421
diff changeset
662 95de7fc6918dea4c9c8d5382f50649794b474c4a 909a0fb57e5d909f353d89e394ffd7e0890fec88 0 {'date': '', 'user': 'test'} (glob)
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 421
diff changeset
663 909a0fb57e5d909f353d89e394ffd7e0890fec88 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 0 {'date': '', 'user': 'test'} (glob)
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 421
diff changeset
664 1f0dee641bb7258c56bd60e93edfa2405381c41e 83b5778897adafb967ef2f75be3aaa4fce49a4cc 0 {'date': '', 'user': 'test'} (glob)
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 421
diff changeset
665 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
666 0d3f46688ccc6e756c7e96cf64c391c411309597 2033b4e494742365851fac84d276640cbf52833e 0 {'date': '* *', 'user': 'test'} (glob)
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 421
diff changeset
667 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 9468a5f5d8b2c5d91e17474e95ae4791e9718fdf 0 {'date': '* *', 'user': 'test'} (glob)
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 421
diff changeset
668 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
669 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
670 #no produced by 2.3
39eb12bb47c0 commit --amend: adap to core 63e45aee46d4
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 492
diff changeset
671 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
672
803
b96d51a357bd test: get rid of all reference to conflicting changesets
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 763
diff changeset
673 Check divergence detection
354
bd26eb9714fb obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 320
diff changeset
674
bd26eb9714fb obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 320
diff changeset
675 $ hg up 9468a5f5d8b2 # add obsol_d''
bd26eb9714fb obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 320
diff changeset
676 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
677 $ mkcommit "obsolet_conflicting_d"
bd26eb9714fb obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 320
diff changeset
678 $ hg summary
554
39eb12bb47c0 commit --amend: adap to core 63e45aee46d4
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 492
diff changeset
679 parent: 1[46]:50f11e5e3a63 tip (re)
354
bd26eb9714fb obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 320
diff changeset
680 add obsolet_conflicting_d
bd26eb9714fb obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 320
diff changeset
681 branch: default
bd26eb9714fb obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 320
diff changeset
682 commit: (clean)
625
e291e5271694 prepare for Full scale filtering !!!
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 594
diff changeset
683 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
684 bumped: 1 changesets
359
43f79983f638 merge with conflicting detection
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 346 356
diff changeset
685 $ 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
686 $ hg log -r 'divergent()'
587
8152fedbac65 evolve: smarter code for divergent changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 586
diff changeset
687 changeset: 12:6db5e282cb91
8152fedbac65 evolve: smarter code for divergent changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 586
diff changeset
688 parent: 10:2033b4e49474
8152fedbac65 evolve: smarter code for divergent changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 586
diff changeset
689 user: test
8152fedbac65 evolve: smarter code for divergent changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 586
diff changeset
690 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
691 summary: add obsol_d'''
8152fedbac65 evolve: smarter code for divergent changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 586
diff changeset
692
590
02cadd3dc9f4 evolve: adapt to 2.4 code
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 587
diff changeset
693 changeset: 16:50f11e5e3a63
354
bd26eb9714fb obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 320
diff changeset
694 tag: tip
bd26eb9714fb obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 320
diff changeset
695 parent: 11:9468a5f5d8b2
bd26eb9714fb obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 320
diff changeset
696 user: test
bd26eb9714fb obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 320
diff changeset
697 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
698 summary: add obsolet_conflicting_d
bd26eb9714fb obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 320
diff changeset
699
750
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents: 747
diff changeset
700
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents: 747
diff changeset
701 $ hg up --hidden 3 -q
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents: 747
diff changeset
702 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
703 $ hg evolve
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents: 747
diff changeset
704 parent is obsolete with multiple successors:
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents: 747
diff changeset
705 [4] add obsol_c'
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents: 747
diff changeset
706 [10] add obsol_c
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents: 747
diff changeset
707 [2]
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents: 747
diff changeset
708 $ hg olog
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents: 747
diff changeset
709 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
710 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
711 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
712 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
713
763
966e2659e989 import: warn about new unstable changesets
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents: 756
diff changeset
714
966e2659e989 import: warn about new unstable changesets
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents: 756
diff changeset
715 Check import reports new unstable changeset:
966e2659e989 import: warn about new unstable changesets
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents: 756
diff changeset
716
966e2659e989 import: warn about new unstable changesets
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents: 756
diff changeset
717 $ hg up --hidden 2
966e2659e989 import: warn about new unstable changesets
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents: 756
diff changeset
718 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
719 working directory parent is obsolete!
966e2659e989 import: warn about new unstable changesets
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents: 756
diff changeset
720 $ hg export 9468a5f5d8b2 | hg import -
966e2659e989 import: warn about new unstable changesets
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents: 756
diff changeset
721 applying patch from stdin
966e2659e989 import: warn about new unstable changesets
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents: 756
diff changeset
722 1 new unstable changesets
816
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
723
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
724
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
725 Relevant marker computation
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
726 ==============================
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
727
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
728 $ hg log -G --hidden
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
729 @ changeset: 17:a5f7a21fe7bc
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
730 | tag: tip
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
731 | parent: 2:4538525df7e2
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
732 | user: test
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
733 | 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
734 | summary: add obsol_d''
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
735 |
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
736 | o changeset: 16:50f11e5e3a63
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
737 | | parent: 11:9468a5f5d8b2
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
738 | | user: test
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
739 | | 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
740 | | summary: add obsolet_conflicting_d
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
741 | |
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
742 | | o changeset: 15:705ab2a6b72e
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
743 | | | parent: 10:2033b4e49474
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
744 | | | user: test
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
745 | | | 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
746 | | | summary: add f
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
747 | | |
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
748 | | | x changeset: 14:33d458d86621
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
749 | | | | user: test
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
750 | | | | date: Thu Jan 01 00:00:00 1970 +0000
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
751 | | | | summary: temporary amend commit for 0b1b6dd009c0
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
752 | | | |
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
753 | | | x changeset: 13:0b1b6dd009c0
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
754 | | |/ parent: 10:2033b4e49474
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
755 | | | user: test
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
756 | | | 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
757 | | | summary: add f
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
758 | | |
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
759 | | | o changeset: 12:6db5e282cb91
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
760 | | |/ parent: 10:2033b4e49474
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
761 | | | user: test
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
762 | | | date: Thu Jan 01 00:00:00 1970 +0000
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
763 | | | summary: add obsol_d'''
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
764 | | |
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
765 | o | changeset: 11:9468a5f5d8b2
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
766 | |/ user: test
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
767 | | 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
768 | | summary: add obsol_d''
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
769 | |
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
770 | o changeset: 10:2033b4e49474
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
771 | | parent: 4:725c380fe99b
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
772 | | user: test
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
773 | | 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
774 | | summary: add obsol_c
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
775 | |
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
776 | | x changeset: 9:83b5778897ad
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
777 | | parent: -1:000000000000
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
778 | | user: test
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
779 | | 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
780 | | summary: add toto
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
781 | |
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
782 | | x changeset: 8:159dfc9fa5d3
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
783 | | | parent: 3:0d3f46688ccc
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
784 | | | user: test
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
785 | | | 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
786 | | | summary: add obsol_d''
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
787 | | |
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
788 | | | x changeset: 7:909a0fb57e5d
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
789 | | |/ parent: 3:0d3f46688ccc
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
790 | | | user: test
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
791 | | | 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
792 | | | summary: add obsol_d'
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
793 | | |
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
794 | | | x changeset: 6:95de7fc6918d
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
795 | | |/ parent: 3:0d3f46688ccc
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 obsol_d
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 | | | x changeset: 5:a7a6f2b5d8a5
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
801 | | |/ parent: 3:0d3f46688ccc
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
802 | | | user: test
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
803 | | | 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
804 | | | summary: add d
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 | o | changeset: 4:725c380fe99b
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
807 | | | parent: 1:7c3bad9141dc
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
808 | | | user: test
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
809 | | | 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
810 | | | summary: add obsol_c'
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
811 | | |
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
812 | | x changeset: 3:0d3f46688ccc
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
813 | |/ parent: 1:7c3bad9141dc
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
814 | | user: test
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
815 | | date: Thu Jan 01 00:00:00 1970 +0000
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
816 | | summary: add obsol_c
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
817 | |
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
818 x | changeset: 2:4538525df7e2
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
819 |/ user: test
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
820 | 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
821 | summary: add c
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
822 |
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
823 o changeset: 1:7c3bad9141dc
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
824 | user: test
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
825 | 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
826 | summary: add b
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
827 |
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
828 o changeset: 0:1f0dee641bb7
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
829 user: test
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
830 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
831 summary: add a
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
832
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
833
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
834 Simple rewrite
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
835
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
836 $ hg --hidden debugobsoleterelevant 3
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
837 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
838
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
839 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
840
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
841 $ hg debugobsoleterelevant 15
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
842 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
843 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
844
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
845 Transitive rewrite
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
846
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
847 $ hg --hidden debugobsoleterelevant 8
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
848 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
849 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
850 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
851