Re: stg 0.14.3 breakage on push after moving hunk

On 2008-09-25 01:26:54 +0200, Yann Dirson wrote:

Just saw the following problem - ever saw that ?

$ 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

No, but try this ...

diff --git a/stgit/gitmergeonefile.py b/stgit/gitmergeonefile.py
index c1af2f8..55b62db 100644
--- a/stgit/gitmergeonefile.py
+++ b/stgit/gitmergeonefile.py

@@ -264,7 +264,7 @@ def merge(orig_hash, file1_hash, file2_hash,
                     __conflict(path)
                     return 1
                 if file1_mode != file2_mode:
-                    out.error('File "s" added in both, permissions conflict'
+                    out.error('File "%s" added in both, permissions conflict'
                               % path)
                     __conflict(path)
                     return 1

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle