Show More
@@ -1992,8 +1992,12 b' class localrepository(repo.repository):' | |||||
1992 | url=url, pending=p) |
|
1992 | url=url, pending=p) | |
1993 |
|
1993 | |||
1994 | added = [cl.node(r) for r in xrange(clstart, clend)] |
|
1994 | added = [cl.node(r) for r in xrange(clstart, clend)] | |
1995 | if srctype != 'strip': |
|
1995 | if self.ui.configbool('phases', 'publish', True): | |
1996 | phases.advanceboundary(self, 0, added) |
|
1996 | if srctype != 'strip': | |
|
1997 | phases.advanceboundary(self, 0, added) | |||
|
1998 | else: | |||
|
1999 | phases.retractboundary(self, 1, added) | |||
|
2000 | ||||
1997 | # make changelog see real files again |
|
2001 | # make changelog see real files again | |
1998 | cl.finalize(trp) |
|
2002 | cl.finalize(trp) | |
1999 |
|
2003 |
@@ -109,4 +109,30 b' update must update phase of common chang' | |||||
109 | 1 0 a-B |
|
109 | 1 0 a-B | |
110 | 0 0 a-A |
|
110 | 0 0 a-A | |
111 |
|
111 | |||
|
112 | Publish configuration option | |||
|
113 | ---------------------------- | |||
112 |
|
114 | |||
|
115 | changegroup are added without phase movement | |||
|
116 | ||||
|
117 | $ hg bundle -a ../base.bundle | |||
|
118 | 5 changesets found | |||
|
119 | $ cd .. | |||
|
120 | $ hg init mu | |||
|
121 | $ cd mu | |||
|
122 | $ cat > .hg/hgrc << EOF | |||
|
123 | > [phases] | |||
|
124 | > publish=0 | |||
|
125 | > EOF | |||
|
126 | $ hg unbundle ../base.bundle | |||
|
127 | adding changesets | |||
|
128 | adding manifests | |||
|
129 | adding file changes | |||
|
130 | added 5 changesets with 5 changes to 5 files (+1 heads) | |||
|
131 | (run 'hg heads' to see heads, 'hg merge' to merge) | |||
|
132 | $ hgph | |||
|
133 | 4 1 a-D | |||
|
134 | 3 1 a-C | |||
|
135 | 2 1 b-A | |||
|
136 | 1 1 a-B | |||
|
137 | 0 1 a-A | |||
|
138 |
General Comments 0
You need to be logged in to leave comments.
Login now