Am Sonntag, den 27.07.2008, 15:01 +0200 schrieb Jasper Groenewegen: > > I don't think it's a good idea to add applying merge directives to the > > merge dialog though, except for perhaps allowing them to be entered in > > the URL field. We already have a "apply merge directive" window > > specifically for this purpose. > > Jelmer > > I do think that we should replicate the feature set of the original bzr > merge command since that is what users will expect. And 'bzr merge > /path/to/bundle.patch' is one of those use cases. Actually, I don't know > another way to merge a bundle right now. :o > Having it as a separate option enables us to use a separate other_branch > initiation when merge_source == 2 (bundle). The goal of bzr-gtk is explicitly not to replicate the command-line interface to bzr bit for bit. Consistency is good if that makes sense, but if there's a good reason for it it's fine to be different.
In this particular case, I think it's fine to support a bundle path being entered in the source branch URL in the "merge window" but 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. The command-line interface to bzr only has to perform the merge, it doesn't have to e.g. allow browsing what branch to merge or merge directive to apply. It also can't provide any sort of preview while you're browsing. Cheers, Jelmer -- Jelmer Vernooij <[EMAIL PROTECTED]> - http://samba.org/~jelmer/ Jabber: [EMAIL PROTECTED] -- bzr-gtk mailing list [email protected] Modify settings or unsubscribe at: https://lists.canonical.com/mailman/listinfo/bzr-gtk
