Ticket #2863 (closed enhancement: fixed)

Opened 6 years ago

Last modified 5 years ago

MergeOther

Reported by: szaszg Owned by: angel_il
Priority: major Milestone: 4.8.5
Component: mcdiff Version: master
Keywords: Cc:
Blocked By: Blocking:
Branch state: merged Votes for changeset: committed-master

Description

mcdiffviewer can merge only from right panel to left panel file.

It will be nice, if -- similar to edit and edit other -- mcdiffviewer can merge hunks into the opposite directions too.

This patch add this feature to mcdiffviewer. With F15 mcdiffviewer merge left panel to right panel direction.

Attachments

mc.dviewer_mergeother.diff (10.1 KB) - added by szaszg 6 years ago.

Change History

Changed 6 years ago by szaszg

comment:1 Changed 6 years ago by angel_il

  • Owner set to angel_il
  • Status changed from new to accepted
  • Branch state changed from no branch to on review

branch: 2863_mcdiff_merge_enhance

please review

comment:2 Changed 5 years ago by slavazanko

Will be better, if the 'merge' action will made in any direction (from left to right panel and vise versa). This action should looks like 'Copy file' action in the file panels.
Active panel should be highlighted (for example, an active merge panel will contain some informative header, but passive not). Toggle focus between panels should be performed in same way as for the file panels: bu TAB key. Merge will performed from active to passive panel.

comment:3 Changed 5 years ago by angel_il

  • Milestone changed from Future Releases to 4.8.5

comment:4 Changed 5 years ago by slavazanko

  • Votes for changeset set to slavazanko

comment:5 Changed 5 years ago by andrew_b

  • Votes for changeset changed from slavazanko to slavazanko andrew_b
  • Branch state changed from on review to approved

comment:6 Changed 5 years ago by angel_il

  • Status changed from accepted to testing
  • Votes for changeset changed from slavazanko andrew_b to committed-master
  • Resolution set to fixed
  • Branch state changed from approved to merged

comment:7 Changed 5 years ago by andrew_b

  • Status changed from testing to closed
Note: See TracTickets for help on using tickets.