equal
deleted
inserted
replaced
179 repo, fctx, m1, m2, linkrev, tr, writefilecopymeta, ms |
179 repo, fctx, m1, m2, linkrev, tr, writefilecopymeta, ms |
180 ) |
180 ) |
181 if is_touched: |
181 if is_touched: |
182 if is_touched == 'added': |
182 if is_touched == 'added': |
183 files.mark_added(f) |
183 files.mark_added(f) |
|
184 elif is_touched == 'merged': |
|
185 files.mark_merged(f) |
184 else: |
186 else: |
185 files.mark_touched(f) |
187 files.mark_touched(f) |
186 m.setflag(f, fctx.flags()) |
188 m.setflag(f, fctx.flags()) |
187 except OSError: |
189 except OSError: |
188 repo.ui.warn(_(b"trouble committing %s!\n") % uipathfn(f)) |
190 repo.ui.warn(_(b"trouble committing %s!\n") % uipathfn(f)) |
345 force_new_node = True |
347 force_new_node = True |
346 # is the file changed? |
348 # is the file changed? |
347 text = fctx.data() |
349 text = fctx.data() |
348 if fparent2 != nullid or meta or flog.cmp(fparent1, text) or force_new_node: |
350 if fparent2 != nullid or meta or flog.cmp(fparent1, text) or force_new_node: |
349 if touched is None: # do not overwrite added |
351 if touched is None: # do not overwrite added |
350 touched = 'modified' |
352 if fparent2 == nullid: |
|
353 touched = 'modified' |
|
354 else: |
|
355 touched = 'merged' |
351 fnode = flog.add(text, meta, tr, linkrev, fparent1, fparent2) |
356 fnode = flog.add(text, meta, tr, linkrev, fparent1, fparent2) |
352 # are just the flags changed during merge? |
357 # are just the flags changed during merge? |
353 elif fname in manifest1 and manifest1.flags(fname) != fctx.flags(): |
358 elif fname in manifest1 and manifest1.flags(fname) != fctx.flags(): |
354 touched = 'modified' |
359 touched = 'modified' |
355 fnode = fparent1 |
360 fnode = fparent1 |