56 3 0d3f46688ccc |
56 3 0d3f46688ccc |
57 |
57 |
58 Test communication of obsolete relation with a compatible client |
58 Test communication of obsolete relation with a compatible client |
59 |
59 |
60 $ hg init ../other-new |
60 $ hg init ../other-new |
61 $ hg push ../other-new |
61 $ hg push --traceback ../other-new |
62 pushing to ../other-new |
62 pushing to ../other-new |
63 searching for changes |
63 searching for changes |
64 adding changesets |
64 adding changesets |
65 adding manifests |
65 adding manifests |
66 adding file changes |
66 adding file changes |
67 added 6 changesets with 6 changes to 6 files (+2 heads) |
67 added 5 changesets with 5 changes to 5 files (+1 heads) |
68 $ qlog -R ../other-new -r 'obsolete()' |
68 $ qlog -R ../other-new -r 'obsolete()' |
69 3 0d3f46688ccc |
69 2 0d3f46688ccc |
70 $ qlog -R ../other-new |
70 $ qlog -R ../other-new |
71 5 a7a6f2b5d8a5 |
71 4 a7a6f2b5d8a5 |
72 4 725c380fe99b |
72 3 725c380fe99b |
73 3 0d3f46688ccc |
73 2 0d3f46688ccc |
74 1 7c3bad9141dc |
74 1 7c3bad9141dc |
75 0 1f0dee641bb7 |
75 0 1f0dee641bb7 |
76 $ hg up 3 -q |
76 $ hg up 3 -q |
77 $ mkcommit obsol_d # 6 |
77 $ mkcommit obsol_d # 6 |
78 created new head |
78 created new head |
91 adding changesets |
91 adding changesets |
92 adding manifests |
92 adding manifests |
93 adding file changes |
93 adding file changes |
94 added 1 changesets with 1 changes to 1 files (+1 heads) |
94 added 1 changesets with 1 changes to 1 files (+1 heads) |
95 $ qlog -R ../other-new |
95 $ qlog -R ../other-new |
96 6 95de7fc6918d |
96 5 95de7fc6918d |
97 4 725c380fe99b |
97 3 725c380fe99b |
98 3 0d3f46688ccc |
98 2 0d3f46688ccc |
99 1 7c3bad9141dc |
99 1 7c3bad9141dc |
100 0 1f0dee641bb7 |
100 0 1f0dee641bb7 |
101 $ qlog -R ../other-new -r 'obsolete()' |
101 $ qlog -R ../other-new -r 'obsolete()' |
102 3 0d3f46688ccc |
102 2 0d3f46688ccc |
103 $ hg up -q .^ |
103 $ hg up -q .^ |
104 $ mkcommit "obsol_d'" # 7 |
104 $ mkcommit "obsol_d'" # 7 |
105 created new head |
105 created new head |
106 $ hg debugobsolete 7 6 |
106 $ hg debugobsolete 7 6 |
107 $ hg pull -R ../other-new . |
107 $ hg pull -R ../other-new . |
108 pulling from . |
108 pulling from . |
109 searching for changes |
109 searching for changes |
110 adding changesets |
110 adding changesets |
111 adding manifests |
111 adding manifests |
112 adding file changes |
112 adding file changes |
113 added 1 changesets with 1 changes to 1 files (+1 heads) |
113 added 2 changesets with 2 changes to 2 files (+2 heads) |
114 (run 'hg heads .' to see heads, 'hg merge' to merge) |
114 (run 'hg heads .' to see heads, 'hg merge' to merge) |
115 $ qlog -R ../other-new |
115 $ qlog -R ../other-new |
116 7 909a0fb57e5d |
116 7 909a0fb57e5d |
117 4 725c380fe99b |
117 3 725c380fe99b |
118 3 0d3f46688ccc |
118 2 0d3f46688ccc |
|
119 1 7c3bad9141dc |
|
120 0 1f0dee641bb7 |
|
121 |
|
122 pushing to stuff that doesn't support obsolete |
|
123 |
|
124 $ hg init ../other-old |
|
125 $ echo '[extensions]' > ../other-old/.hg/hgrc |
|
126 $ echo "obsolete=!$(echo $(dirname $TESTDIR))/obsolete.py" >> ../other-old/.hg/hgrc |
|
127 $ hg push ../other-old |
|
128 pushing to ../other-old |
|
129 searching for changes |
|
130 adding changesets |
|
131 adding manifests |
|
132 adding file changes |
|
133 added 5 changesets with 5 changes to 5 files (+1 heads) |
|
134 $ qlog -R ../other-old |
|
135 4 909a0fb57e5d |
|
136 3 725c380fe99b |
|
137 2 0d3f46688ccc |
119 1 7c3bad9141dc |
138 1 7c3bad9141dc |
120 0 1f0dee641bb7 |
139 0 1f0dee641bb7 |
121 |
140 |
122 |
141 |
123 |
142 |