search

fourier / ztree

Directory tree comparison mode for Emacs
http://www.emacswiki.org/emacs/ZtreeDiff
GNU General Public License v3.0
239 stars 21 forks source link

[Feature Request] ztree-merge #11

Open shevchuk opened 10 years ago

shevchuk commented 10 years ago

Thanks for your mode - it looks great. And it is asking for a ztree-merge or something that will merge directories left->right and vice versa. E.g. I have a diff between two directories and one of them has a unique directory there should be an easy way to copy it into the other.

If this feature should not be included in ztree and is implemented flawlessly in other emacs functionalities please share and close this request =)

fourier commented 10 years ago

That idea requires carefull consideration about different cases, like what if some the 2 directories have some different files? should we overwrite them or skip and copy the ones which doesn't exist on one of panes?

shevchuk commented 10 years ago

It would be nice if it will work like normal ediff: there is a mini frame that handles actions such as copy from a to b by typing a or b. In this case if files have equal names but content differs (normal merge flow) I would run ediff against them. If it is a new file I would simply copy it. If there is no file in the destination folder I would prompt to skip copying it.