Using meld to resolve merge conflicts in versioned trees



Hi,
As Meld has some support for versionned tree tracking, it's an usefull tool
to visualise diffs between the current working directory and the repository.
Yet, i'm not sure if it's possible to use it to resolve conflicts, as no such
things seems implemented. I wonder if such feature is on the roadmap.
Specifically - i admit i only looked at the "bzr" plugin for vcview - it would
be usefull to add another command in the vcview/menu_popup, something like
"conflicts resolve" which could then trigger, in the case of conflicts files,
the 2 or 3 pane merge windows on the correct corresponding files (in the case
of bazaar, the .BASE/.THIS/.OTHER-suffixed files which should otherwise be
ignored) then save or commit.
I wonder if you plan to add those few new functions in the Vc class, or accept
patches in that directions.
Thanks

--
Benjamin Thyreau


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]