Show More
@@ -443,7 +443,13 b' class transplanter(object):' | |||||
443 | ) |
|
443 | ) | |
444 | if merge: |
|
444 | if merge: | |
445 | repo.setparents(p1, parents[1]) |
|
445 | repo.setparents(p1, parents[1]) | |
446 |
|
|
446 | st = repo.status() | |
|
447 | modified, added, removed, deleted = ( | |||
|
448 | st.modified, | |||
|
449 | st.added, | |||
|
450 | st.removed, | |||
|
451 | st.deleted, | |||
|
452 | ) | |||
447 | if merge or modified or added or removed or deleted: |
|
453 | if merge or modified or added or removed or deleted: | |
448 | n = repo.commit( |
|
454 | n = repo.commit( | |
449 | message, |
|
455 | message, |
General Comments 0
You need to be logged in to leave comments.
Login now