Show More
@@ -73,6 +73,13 b' command = registrar.command(cmdtable)' | |||||
73 | # leave the attribute unspecified. |
|
73 | # leave the attribute unspecified. | |
74 | testedwith = 'ships-with-hg-core' |
|
74 | testedwith = 'ships-with-hg-core' | |
75 |
|
75 | |||
|
76 | configtable = {} | |||
|
77 | configitem = registrar.configitem(configtable) | |||
|
78 | ||||
|
79 | configitem('experimental', 'rebaseskipobsolete', | |||
|
80 | default=True, | |||
|
81 | ) | |||
|
82 | ||||
76 | def _nothingtorebase(): |
|
83 | def _nothingtorebase(): | |
77 | return 1 |
|
84 | return 1 | |
78 |
|
85 | |||
@@ -307,8 +314,7 b' class rebaseruntime(object):' | |||||
307 | destmap: {srcrev: destrev} destination revisions |
|
314 | destmap: {srcrev: destrev} destination revisions | |
308 | """ |
|
315 | """ | |
309 | self.obsoletenotrebased = {} |
|
316 | self.obsoletenotrebased = {} | |
310 |
if not self.ui.configbool('experimental', 'rebaseskipobsolete' |
|
317 | if not self.ui.configbool('experimental', 'rebaseskipobsolete'): | |
311 | default=True): |
|
|||
312 | return |
|
318 | return | |
313 | obsoleteset = set(obsoleterevs) |
|
319 | obsoleteset = set(obsoleterevs) | |
314 | self.obsoletenotrebased = _computeobsoletenotrebased(self.repo, |
|
320 | self.obsoletenotrebased = _computeobsoletenotrebased(self.repo, |
General Comments 0
You need to be logged in to leave comments.
Login now