also sprach Petr Baudis <pasky@xxxxxxx> [2008.09.21.1619 +0200]: > > Yes, it does. One might want to consider to make the use of -s ours > > in (iiii) configurable, but otherwise that's it. > > That might be pretty dangerous, since then your topic branch will have > outstanding branches of the retired branch, but they will _NOT_ be > visible to tg patch and others since they will be in both the base and > head. Well, but what if upstream implemented our solution slightly differently, and if it's only because they used tabs instead of spaces? We wouldn't want -s ours then, huh? -- martin | http://madduck.net/ | http://two.sentenc.es/ "on the other hand, with the advent of msvc 5, i can claim i use emacs because it's smaller and more efficient." :-)" -- darin johnson spamtraps: madduck.bogus@xxxxxxxxxxx
Attachment:
digital_signature_gpg.asc
Description: Digital signature (see http://martin-krafft.net/gpg/)