equal
deleted
inserted
replaced
236 changeset extra as copy source of truth). |
236 changeset extra as copy source of truth). |
237 |
237 |
238 output: (filenode, touched) |
238 output: (filenode, touched) |
239 |
239 |
240 filenode: the filenode that should be used by this changeset |
240 filenode: the filenode that should be used by this changeset |
241 touched: one of: None, 'added' or 'modified' |
241 touched: one of: None (mean untouched), 'added' or 'modified' |
242 """ |
242 """ |
243 |
243 |
244 fname = fctx.path() |
244 fname = fctx.path() |
245 fparent1 = manifest1.get(fname, nullid) |
245 fparent1 = manifest1.get(fname, nullid) |
246 fparent2 = manifest2.get(fname, nullid) |
246 fparent2 = manifest2.get(fname, nullid) |