Menu

#719 Manual difference alignment

None
closed-accepted
nobody
3
2023-05-18
2006-03-09
Bryan
No

I'd like to be able to select a line on each side and
tell WinMerge that they are the same. In other words,
resync on the selected lines.

WinMerge 2.4.6.0
Windows XP Pro sp2

Discussion

  • Kimmo Varis

    Kimmo Varis - 2006-03-10

    Logged In: YES
    user_id=631874

    Nice idea, and would be useful.

    However, very tricky to implement, so lower priority.

    Some technical details for whoever is interested in
    implementation:
    - we have DIFFRANGE list, every DIFFRANGE item has
    linenumbers of difference area from *both* files.
    - which means that to resynch one needs to re-calculate all
    differences

     
  • Kimmo Varis

    Kimmo Varis - 2006-03-10
    • priority: 5 --> 3
     
  • Dror Harari

    Dror Harari - 2006-12-13

    Logged In: YES
    user_id=1042821
    Originator: NO

    This feature has cause a little envy on my side of coworkers using the commercial Beyond Compare tool which does have this feature. It comes in very handy after heavier refactoring work that sometimes throws the diff engine entirely off. Lower priority? we have patience 8-)

     
  • Aalbert Torsius

    Aalbert Torsius - 2009-08-13

    ID: 1647433 is a duplicate of this request.

     
  • bwiggett

    bwiggett - 2010-05-05

    Would really be a great feature and would find it very useful.

     
  • Takashi Sawanaka

    • status: open --> closed-accepted
    • Group: -->
     
  • Takashi Sawanaka

    This RFE is implemented in 2.15.2
    Please click the Merge / Add Synchronization Point menu item to re-sync on the selected lines

     
    • talbot_sk

      talbot_sk - 2023-05-18

      I do not know how it works. I would like to manually sync two lines of two files. How many sync point can I sync. It looks it can't sync more than two lines. I am unable to sync the second pair of lines. The sync of the second pair of another two lines in the same session/comparison doesn't work. When I sync the second pair of lines, it unsync files unpredictably... :'(
      Version 2.13.30.0

       

      Last edit: talbot_sk 2023-05-18
      • Takashi Sawanaka

        In WinMerge, synchronization points represent where files are split and compared.
        For this reason, it is not guaranteed that the set synchronization points will always be at the same position. In particular, it seems that it often does not work well when the synchronization point is set on the line where there is no difference.

        If you set synchronization points in the </dxlc:LayoutItem.Resource> line like the attached image, you will get the expected result.

         

Log in to post a comment.