equal
deleted
inserted
replaced
253 |
253 |
254 tags = [] |
254 tags = [] |
255 progress = ui.makeprogress( |
255 progress = ui.makeprogress( |
256 _(b'building'), unit=_(b'revisions'), total=total |
256 _(b'building'), unit=_(b'revisions'), total=total |
257 ) |
257 ) |
|
258 merge_relaxed_sync = ui.configbool( |
|
259 b'experimental', |
|
260 b'relaxed-block-sync-merge', |
|
261 ) |
258 with progress, repo.wlock(), repo.lock(), repo.transaction(b"builddag"): |
262 with progress, repo.wlock(), repo.lock(), repo.transaction(b"builddag"): |
259 at = -1 |
263 at = -1 |
260 atbranch = b'default' |
264 atbranch = b'default' |
261 nodeids = [] |
265 nodeids = [] |
262 id = 0 |
266 id = 0 |
277 p2 = repo[ps[1]] |
281 p2 = repo[ps[1]] |
278 pa = p1.ancestor(p2) |
282 pa = p1.ancestor(p2) |
279 base, local, other = [ |
283 base, local, other = [ |
280 x[fn].data() for x in (pa, p1, p2) |
284 x[fn].data() for x in (pa, p1, p2) |
281 ] |
285 ] |
282 m3 = simplemerge.Merge3Text(base, local, other) |
286 m3 = simplemerge.Merge3Text( |
|
287 base, |
|
288 local, |
|
289 other, |
|
290 relaxed_sync=merge_relaxed_sync, |
|
291 ) |
283 ml = [ |
292 ml = [ |
284 l.strip() |
293 l.strip() |
285 for l in simplemerge.render_minimized(m3)[0] |
294 for l in simplemerge.render_minimized(m3)[0] |
286 ] |
295 ] |
287 ml.append(b"") |
296 ml.append(b"") |