Just saw the following problem - ever saw that ?
Getting into context: split changes affecting a particular file into
another patch
$ stg --version
Stacked GIT 0.14.3
git version 1.6.0.1
Python version 2.5.2 (r252:60911, Aug 8 2008, 09:22:44)
[GCC 4.3.1]
$ stg pop
Checking for changes in the working directory ... done
Popping patch "factorize" ... done
Now at patch "x-dummy"
$ stg new -m test
$ stg-fold-files-from factorize 't/*'
Checking for changes in the working directory ... done
Folding patch from stdin ... done
$ stg ref
Checking for changes in the working directory ... done
Refreshing patch "test" ... done
... then attempting to push to get rid of the now-duplicated changes
from orig patch (which has been how I have used stg-fold-files-from
ever since I wrote it, so I'm pretty sure it used to work, but then,
it's been a couple of months since I did not use it ;):
$ stg push
Checking for changes in the working directory ... done
Pushing patch "factorize" ... Traceback (most recent call last):
File "/usr/bin/stg", line 43, in <module>
main()
File "/var/lib/python-support/python2.5/stgit/main.py", line 281, in main
command.func(parser, options, args)
File "/var/lib/python-support/python2.5/stgit/commands/push.py", line 102, in func
push_patches(crt_series, patches, options.merged)
File "/var/lib/python-support/python2.5/stgit/commands/common.py", line 202, in push_patches
modified = crt_series.push_patch(p)
File "/var/lib/python-support/python2.5/stgit/stack.py", line 1112, in push_patch
git.merge(bottom, head, top, recursive = True)
File "/var/lib/python-support/python2.5/stgit/git.py", line 790, in merge
stages['2'][0], stages['3'][0]) != 0:
File "/var/lib/python-support/python2.5/stgit/gitmergeonefile.py", line 268, in merge
% path)
TypeError: not all arguments converted during string formatting
Best regards,
--
Yann
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
