equal
deleted
inserted
replaced
340 extra = {'transplant_source': node} |
340 extra = {'transplant_source': node} |
341 wlock = repo.wlock() |
341 wlock = repo.wlock() |
342 try: |
342 try: |
343 p1, p2 = repo.dirstate.parents() |
343 p1, p2 = repo.dirstate.parents() |
344 if p1 != parent: |
344 if p1 != parent: |
345 raise util.Abort( |
345 raise util.Abort(_('working directory not at transplant ' |
346 _('working dir not at transplant parent %s') % |
346 'parent %s') % revlog.hex(parent)) |
347 revlog.hex(parent)) |
|
348 if merge: |
347 if merge: |
349 repo.setparents(p1, parents[1]) |
348 repo.setparents(p1, parents[1]) |
350 modified, added, removed, deleted = repo.status()[:4] |
349 modified, added, removed, deleted = repo.status()[:4] |
351 if merge or modified or added or removed or deleted: |
350 if merge or modified or added or removed or deleted: |
352 n = repo.commit(message, user, date, extra=extra, |
351 n = repo.commit(message, user, date, extra=extra, |