##// END OF EJS Templates
phases: set new commit in 1-phase
Pierre-Yves David -
r15483:9ae766f2 default
parent child Browse files
Show More
@@ -1243,6 +1243,8 b' class localrepository(repo.repository):'
1243 self.hook('pretxncommit', throw=True, node=hex(n), parent1=xp1,
1243 self.hook('pretxncommit', throw=True, node=hex(n), parent1=xp1,
1244 parent2=xp2, pending=p)
1244 parent2=xp2, pending=p)
1245 self.changelog.finalize(trp)
1245 self.changelog.finalize(trp)
1246 # ensure the new commit is 1-phase
1247 phases.retractboundary(self, 1, [n])
1246 tr.close()
1248 tr.close()
1247
1249
1248 if self._branchcache:
1250 if self._branchcache:
@@ -74,6 +74,7 b' Non store repo:'
74 .hg/data/tst.d.hg/foo.i
74 .hg/data/tst.d.hg/foo.i
75 .hg/dirstate
75 .hg/dirstate
76 .hg/last-message.txt
76 .hg/last-message.txt
77 .hg/phaseroots
77 .hg/requires
78 .hg/requires
78 .hg/undo
79 .hg/undo
79 .hg/undo.bookmarks
80 .hg/undo.bookmarks
@@ -103,6 +104,7 b' Non fncache repo:'
103 .hg/store/data
104 .hg/store/data
104 .hg/store/data/tst.d.hg
105 .hg/store/data/tst.d.hg
105 .hg/store/data/tst.d.hg/_foo.i
106 .hg/store/data/tst.d.hg/_foo.i
107 .hg/store/phaseroots
106 .hg/store/undo
108 .hg/store/undo
107 .hg/store/undo.phaseroots
109 .hg/store/undo.phaseroots
108 .hg/undo.bookmarks
110 .hg/undo.bookmarks
@@ -47,6 +47,7 b' Prepare repo r1:'
47 1 r1/.hg/store/data/d1/f2.i
47 1 r1/.hg/store/data/d1/f2.i
48 1 r1/.hg/store/data/f1.i
48 1 r1/.hg/store/data/f1.i
49 1 r1/.hg/store/fncache
49 1 r1/.hg/store/fncache
50 1 r1/.hg/store/phaseroots
50 1 r1/.hg/store/undo
51 1 r1/.hg/store/undo
51 1 r1/.hg/store/undo.phaseroots
52 1 r1/.hg/store/undo.phaseroots
52
53
@@ -76,6 +77,7 b' Repos r1 and r2 should now contain hardl'
76 2 r1/.hg/store/data/d1/f2.i
77 2 r1/.hg/store/data/d1/f2.i
77 2 r1/.hg/store/data/f1.i
78 2 r1/.hg/store/data/f1.i
78 2 r1/.hg/store/fncache
79 2 r1/.hg/store/fncache
80 1 r1/.hg/store/phaseroots
79 1 r1/.hg/store/undo
81 1 r1/.hg/store/undo
80 1 r1/.hg/store/undo.phaseroots
82 1 r1/.hg/store/undo.phaseroots
81
83
@@ -115,6 +117,7 b' Create a non-inlined filelog in r3:'
115 1 r3/.hg/store/data/d1/f2.i
117 1 r3/.hg/store/data/d1/f2.i
116 1 r3/.hg/store/data/f1.i
118 1 r3/.hg/store/data/f1.i
117 1 r3/.hg/store/fncache
119 1 r3/.hg/store/fncache
120 1 r3/.hg/store/phaseroots
118 1 r3/.hg/store/undo
121 1 r3/.hg/store/undo
119 1 r3/.hg/store/undo.phaseroots
122 1 r3/.hg/store/undo.phaseroots
120
123
@@ -199,6 +202,7 b' r4 has hardlinks in the working dir (not'
199 2 r4/.hg/store/data/d1/f2.i
202 2 r4/.hg/store/data/d1/f2.i
200 2 r4/.hg/store/data/f1.i
203 2 r4/.hg/store/data/f1.i
201 2 r4/.hg/store/fncache
204 2 r4/.hg/store/fncache
205 2 r4/.hg/store/phaseroots
202 2 r4/.hg/store/undo
206 2 r4/.hg/store/undo
203 2 r4/.hg/store/undo.phaseroots
207 2 r4/.hg/store/undo.phaseroots
204 2 r4/.hg/undo.bookmarks
208 2 r4/.hg/undo.bookmarks
@@ -229,6 +233,7 b' Update back to revision 11 in r4 should '
229 2 r4/.hg/store/data/d1/f2.i
233 2 r4/.hg/store/data/d1/f2.i
230 2 r4/.hg/store/data/f1.i
234 2 r4/.hg/store/data/f1.i
231 2 r4/.hg/store/fncache
235 2 r4/.hg/store/fncache
236 2 r4/.hg/store/phaseroots
232 2 r4/.hg/store/undo
237 2 r4/.hg/store/undo
233 2 r4/.hg/store/undo.phaseroots
238 2 r4/.hg/store/undo.phaseroots
234 2 r4/.hg/undo.bookmarks
239 2 r4/.hg/undo.bookmarks
@@ -76,6 +76,7 b' new directories are setgid'
76 00660 ./.hg/store/data/dir/bar.i
76 00660 ./.hg/store/data/dir/bar.i
77 00660 ./.hg/store/data/foo.i
77 00660 ./.hg/store/data/foo.i
78 00660 ./.hg/store/fncache
78 00660 ./.hg/store/fncache
79 00660 ./.hg/store/phaseroots
79 00660 ./.hg/store/undo
80 00660 ./.hg/store/undo
80 00660 ./.hg/store/undo.phaseroots
81 00660 ./.hg/store/undo.phaseroots
81 00660 ./.hg/undo.bookmarks
82 00660 ./.hg/undo.bookmarks
@@ -7,4 +7,4 b''
7 $ hg ci -m 'first'
7 $ hg ci -m 'first'
8
8
9 $ hglog
9 $ hglog
10 0 0 first
10 0 1 first
General Comments 0
You need to be logged in to leave comments. Login now