Le 18/10/2011 18:18, MJ Ray a écrit :
Paul Poulain <paul.poulain@biblibre.com>
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)
Well, that will always run with -3, which isn't optional like I think Chris was suggesting. Is there a drawback with it?
yes, that would. But anyway, git tries to apply the patch without 3way before testing 3way. At least that's how I understand git.
If I've understood it right, the co-op's python guru suggests it might be process = git.am(filename, kwargs=**{'_interactive': True, '3': True})
will try and let you know !
but we suspect we should hack git_run to handle leading-number args nicer.
thanks though -- Paul POULAIN http://www.biblibre.com Expert en Logiciels Libres pour l'info-doc Tel : (33) 4 91 81 35 08