Le 10/10/2011 09:58, Chris Cormack a écrit : > * Paul Poulain ([email protected]) wrote: >> Le 10/10/2011 00:48, Robin Sheat a écrit : >>> (also: seconding Paul's mention of git bz, it's a huge >>> time-and-hassle-saver.) >> >> What would be absolutly WONDERFUL would be to add a parameter to update >> the patch status. >> Something like : >> "git bz attach -status signed-off 4321 HEAD " >> Plus fixing the bug that makes attaching more than one patch at a time >> impossible. > > > First i'd like to add a -3 switch so that the apply will use a 3way > merge. At the moment if it fails you have to try that manually. If someone has the Python skill: edit git-bz, at line 1497, you'll see : process = git.am(filename, _interactive=True ) Changing it to : process = git.am(filename, _interactive=True, 3=True ) should do the trick (i've tested with i=true, and you get the git am -i (interactive) as expected)
EXCEPT that python don't like the 3 (or any arg starting with a number), returning a nasty > File "/home/paul/bin/git-bz", line 1497 > process = git.am(filename, _interactive=True, 3=True ) > SyntaxError: keyword can't be an expression I've tried with "3", no success: > File "/home/paul/bin/git-bz", line 1497 > process = git.am(filename, _interactive=True, "3"=True ) > SyntaxError: keyword can't be an expression I've tried with _3, no success either, no python error but git says error: unknown option `-3' I've tried with 3way, "3way", _3way, with 2 starting __ (__3way...) couldn't find the correct syntax. If someone has a suggestion... -- Paul POULAIN http://www.biblibre.com Expert en Logiciels Libres pour l'info-doc Tel : (33) 4 91 81 35 08 _______________________________________________ Koha-devel mailing list [email protected] http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-devel website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
