Markus Lachinger <[email protected]> writes:

[...]

> So my ideal workflow would be:
>
> magit-diff the branches
>
>  ----------------------
> | foo.rb                    |
> | bar.txt                   |
> | .....                        |
>  ----------------------
> When I now go onto foo.rb and trigger the function I am looking for, it will 
> spawn a ediff below:
>
>  ----------------------
> | foo.rb                    |
> | bar.txt                   |
> | .....                        |
>  ----------------------
> | foo.1     | foo.2       |
> |              |                |
> | + Hello  |                |
> | World    | World     |
>  ----------------------
>
> Doing the same again on the diff list will change the ediff file,
> i.a. when I go back to the list and call the function on bar.txt it
> will replace the ediff with the ediff for the bar.txt
>
> Is there any way to do this with vc / magit or another plugin?

Not that I'm know of.

So IIUC, you want

1) to be able to call magit-ediff from a file line in a diff buffer
2) keep the original diff buffer visible
3) have the ediff session update to a new file without having to
   manually quit the previous ediff session

At least at first glance, my guess is that #2 and #3 would require some
pretty tricky fiddling with ediff, and I'm not sure I understand what
the motivation is there.

#1 seems like a reasonable context for magit-ediff-dwim to be aware of,
and I think it should be straightforward to add.

--
Kyle

-- 
You received this message because you are subscribed to the Google Groups 
"magit" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/d/optout.

Reply via email to