equal
deleted
inserted
replaced
2006 /!\ * hg revert --all -r X |
2006 /!\ * hg revert --all -r X |
2007 /!\ * hg ci -m "same message as the amended changeset" => new cset Y |
2007 /!\ * hg ci -m "same message as the amended changeset" => new cset Y |
2008 /!\ * hg kill -n Y W Z |
2008 /!\ * hg kill -n Y W Z |
2009 """) |
2009 """) |
2010 if progresscb: progresscb() |
2010 if progresscb: progresscb() |
|
2011 emtpycommitallowed = repo.ui.backupconfig('ui', 'allowemptycommit') |
2011 tr = repo.transaction('stabilize-divergent') |
2012 tr = repo.transaction('stabilize-divergent') |
2012 try: |
2013 try: |
|
2014 repo.ui.setconfig('ui', 'allowemptycommit', True) |
2013 repo.dirstate.beginparentchange() |
2015 repo.dirstate.beginparentchange() |
2014 repo.dirstate.setparents(divergent.node(), node.nullid) |
2016 repo.dirstate.setparents(divergent.node(), node.nullid) |
2015 repo.dirstate.endparentchange() |
2017 repo.dirstate.endparentchange() |
2016 oldlen = len(repo) |
2018 oldlen = len(repo) |
2017 amend(ui, repo, message='', logfile='') |
2019 amend(ui, repo, message='', logfile='') |
2022 new = repo['.'] |
2024 new = repo['.'] |
2023 obsolete.createmarkers(repo, [(other, (new,))]) |
2025 obsolete.createmarkers(repo, [(other, (new,))]) |
2024 phases.retractboundary(repo, tr, other.phase(), [new.node()]) |
2026 phases.retractboundary(repo, tr, other.phase(), [new.node()]) |
2025 tr.close() |
2027 tr.close() |
2026 finally: |
2028 finally: |
|
2029 repo.ui.restoreconfig(emtpycommitallowed) |
2027 tr.release() |
2030 tr.release() |
2028 |
2031 |
2029 def divergentdata(ctx): |
2032 def divergentdata(ctx): |
2030 """return base, other part of a conflict |
2033 """return base, other part of a conflict |
2031 |
2034 |