Show More
@@ -1251,8 +1251,15 b' class localrepository(repo.repository):' | |||||
1251 | self.hook('pretxncommit', throw=True, node=hex(n), parent1=xp1, |
|
1251 | self.hook('pretxncommit', throw=True, node=hex(n), parent1=xp1, | |
1252 | parent2=xp2, pending=p) |
|
1252 | parent2=xp2, pending=p) | |
1253 | self.changelog.finalize(trp) |
|
1253 | self.changelog.finalize(trp) | |
1254 |
# |
|
1254 | # set the new commit is proper phase | |
1255 | phases.retractboundary(self, 1, [n]) |
|
1255 | targetphase = self.ui.configint('phases', 'new-commit', 1) | |
|
1256 | if targetphase: | |||
|
1257 | # retract boundary do not alter parent changeset. | |||
|
1258 | # if a parent have higher the resulting phase will | |||
|
1259 | # be compliant anyway | |||
|
1260 | # | |||
|
1261 | # if minimal phase was 0 we don't need to retract anything | |||
|
1262 | phases.retractboundary(self, targetphase, [n]) | |||
1256 | tr.close() |
|
1263 | tr.close() | |
1257 |
|
1264 | |||
1258 | if self._branchcache: |
|
1265 | if self._branchcache: |
General Comments 0
You need to be logged in to leave comments.
Login now