Am Sonntag, den 27.07.2008, 15:39 +0200 schrieb Jasper Groenewegen: > > (...) I think > > we should also have a more visible "Apply Merge Directive" window that > > is specific to merge directives and e.g. gives you the ability to browse > > to a file and open that. > > So how about: > - Have an option 'merge from [Bundle (patch file)] > - That gives a filechooser dialog similar to the folder chooser but one > that selects files instead of folders
> - On clicking merge, we open a DiffController/MergeDirectiveController > window so that the user can check if he likes the changes and/or adapt them. Yeah, that makes sense I think. I think it would be nice if the filechooser/folderchooser could also indicate if the currently selected item will merge cleanly, is related to the current branch, etc. That's something for the future though :-) > And again, how can I invoke that patch handler right now? I couldn't > figure that out. Is it only from nautilus-bzr atm? Run bzr-handle-patch, but supply the filename of a merge directive. This is currently registered as file handler for merge directives in GNOME. Cheers, Jelmer -- bzr-gtk mailing list [email protected] Modify settings or unsubscribe at: https://lists.canonical.com/mailman/listinfo/bzr-gtk
