Mercurial > evolve
diff tests/test-evolve-content-divergent-case-A4.t @ 5597:0cb1718ed95c
evolvecmd: move bookmark-deactivation out of _relocatecommit()
The bookmark-deactivation code will be done whether or not we're using
in-memory merge in `_relocatecommit()`. It could be put in a new
`_preparerelocate()` or something, but it's short enough that it
doesn't seem worth it.
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 25 Sep 2020 21:47:30 -0700 |
parents | d7d954b6d518 |
children | c2fab88e6d60 |