git/list[1] front-page[2] threads[3] people[4] search[5] about
 

stg 0.14.3 breakage on push after moving hunk

From
Yann Dirson <ydirson@altern.org>
Date
Sep 24, 2008, 23:26 UTC
Message-ID
<20080924232654.GY4985@nan92-1-81-57-214-146.fbx.proxad.net>
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
Next: Karl Hasselström
Message 1 of 5 in “stg 0.14.3 breakage on push after moving hunk”
  1. Yann DirsonSep 24, 2008
  2. Karl HasselströmSep 25, 2008
  3. Yann DirsonSep 25, 2008
  4. Karl HasselströmSep 25, 2008
  5. Yann DirsonSep 25, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.