D7974: merge: when rename was made on both sides, use ancestor as merge base

[pulkit (Pulkit Goyal)]

pulkit added a comment.


  I am seeing this failure, hope it helps:
  
    (vm)~/repo/hgpush/tests$ ./run-tests.py test-rename-merge1.t          
    running 1 tests using 1 parallel processes                                                      
                                                                                
    --- /home/pulkit/repo/hgpush/tests/test-rename-merge1.t    
    +++ /home/pulkit/repo/hgpush/tests/test-rename-merge1.t.err                  
    @@ -219,16 +219,6 @@                                                                  
        ancestor: 5151c134577e, local: 07fcbc9a74ed+, remote: f21419739508
        preserving z for resolve of z                              
       starting 4 threads for background file closing (?)                     
    -   x: prompt changed/deleted -> m (premerge)                           
    -  picked tool ':prompt' for x (binary False symlink False changedelete True)
    -  file 'x' was deleted in other [merge rev] but was modified in local [working copy].
    -  You can use (c)hanged version, (d)elete, or leave (u)nresolved.                
    -  What do you want to do? u                                              
    -   y: prompt deleted/changed -> m (premerge)                                
    -  picked tool ':prompt' for y (binary False symlink False changedelete True)        
    -  file 'y' was deleted in local [working copy] but was modified in other [merge rev].
    -  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
    -  What do you want to do? u                                 
        z: both renamed from y -> m (premerge)                            
       picked tool ':merge3' for z (binary False symlink False changedelete False)                  
       merging z                                                                
                                                                             
    ERROR: test-rename-merge1.t output changed                                   
    !                                                                                     
    Failed test-rename-merge1.t: output changed
    # Ran 1 tests, 0 skipped, 1 failed.
    python hash seed: 3001008644

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7974/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7974

To: martinvonz, #hg-reviewers, durin42, pulkit
Cc: durin42, marmoute, mercurial-devel