equal
deleted
inserted
replaced
342 # Mark as merged and update dirstate parent info |
342 # Mark as merged and update dirstate parent info |
343 repo.dirstate.update(repo.dirstate.filterfiles(files), 'm') |
343 repo.dirstate.update(repo.dirstate.filterfiles(files), 'm') |
344 p1, p2 = repo.dirstate.parents() |
344 p1, p2 = repo.dirstate.parents() |
345 repo.dirstate.setparents(p1, merge) |
345 repo.dirstate.setparents(p1, merge) |
346 if len(files) > 0: |
346 if len(files) > 0: |
347 commands.addremove_lock(self.ui, repo, files, |
347 cwd = repo.getcwd() |
|
348 cfiles = files |
|
349 if cwd: |
|
350 cfiles = [util.pathto(cwd, f) for f in files] |
|
351 commands.addremove_lock(self.ui, repo, cfiles, |
348 opts={}, wlock=wlock) |
352 opts={}, wlock=wlock) |
349 n = repo.commit(files, message, user, date, force=1, lock=lock, |
353 n = repo.commit(files, message, user, date, force=1, lock=lock, |
350 wlock=wlock) |
354 wlock=wlock) |
351 |
355 |
352 if n == None: |
356 if n == None: |