--- a/hgext3rd/evolve/evolvecmd.py	Sun Jul 08 22:16:17 2018 +0530
+++ b/hgext3rd/evolve/evolvecmd.py	Thu Jun 07 18:18:30 2018 +0530
@@ -1733,9 +1733,25 @@
     try:
         tr = repo.transaction('evolve')
         divergent = evolvestate['divergent']
-        other = evolvestate['other-divergent']
         base = evolvestate['base']
         repo = repo.unfiltered()
+        if evolvestate['relocating']:
+            newother = _completerelocation(ui, repo, evolvestate)
+            current = repo[evolvestate['current']]
+            obsolete.createmarkers(repo, [(current, (repo[newother],))],
+                                   operation='evolve')
+            evolvestate['relocating'] = False
+            evolvestate['relocated'] = newother
+            evolvestate['temprevs'].append(newother)
+            evolvestate['other-divergent'] = newother
+            # continue the resolution by merging the content-divergence
+            _mergecontentdivergents(repo, progresscb,
+                                    repo[divergent],
+                                    repo[newother],
+                                    repo[base],
+                                    evolvestate)
+
+        other = evolvestate['other-divergent']
         ret = _completecontentdivergent(ui, repo, progresscb,
                                         repo[divergent],
                                         repo[other],