{"thread":{"id":"9715","subject":"[PATCH 1/2] Use --force to overwrite python files","startedAt":"2007-08-31T03:04:49Z","lastAt":"2007-08-31T03:04:55Z","messageCount":2,"participants":["Pavel Roskin"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"51978","messageId":"20070831030449.22554.49699.stgit@dv.roinet.com","threadId":"9715","inReplyTo":null,"subject":"[PATCH 1/2] Use --force to overwrite python files","fromName":"Pavel Roskin","fromEmail":"proski@gnu.org","sentAt":"2007-08-31T03:04:49Z","receivedAt":"2007-08-31T03:04:49Z","isPatch":true,"sender":{"key":"proski@gnu.org","avatar":null},"body":"Installing StGIT with \"make install\" is not working properly if another\nversion is installed.  Files under ~/lib/python2.5/site-packages/stgit\nare not updated.\n\nThis causes unexpected problems if switching between different branches\nof StGIT.\n\nUsing \"--force\" ensures that the files in the tree are installed even if\nthe already installed files are newer.\n\nSigned-off-by: Pavel Roskin <proski@gnu.org>\n---\n\n Makefile |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\n\ndiff --git a/Makefile b/Makefile\nindex 8671209..c890b8e 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -6,7 +6,7 @@ all:\n \t$(PYTHON) setup.py build\n \n install:\n-\t$(PYTHON) setup.py install --prefix=$(PREFIX) --root=$(DESTDIR)\n+\t$(PYTHON) setup.py install --prefix=$(PREFIX) --root=$(DESTDIR) --force\n \n doc:\n \tcd Documentation && $(MAKE) all\n"},{"id":"51979","messageId":"20070831030455.22554.75625.stgit@dv.roinet.com","threadId":"9715","inReplyTo":"20070831030449.22554.49699.stgit@dv.roinet.com","subject":"[PATCH 2/2] Fix refresh -es","fromName":"Pavel Roskin","fromEmail":"proski@gnu.org","sentAt":"2007-08-31T03:04:55Z","receivedAt":"2007-08-31T03:04:55Z","isPatch":true,"sender":{"key":"proski@gnu.org","avatar":null},"body":"Use named arguments to call git.diff() from stack.edit_file().\ngit.diff() doesn't write to files anymore, do it in the caller.\n\nSigned-off-by: Pavel Roskin <proski@gnu.org>\n---\n\n stgit/stack.py |    3 ++-\n 1 files changed, 2 insertions(+), 1 deletions(-)\n\n\ndiff --git a/stgit/stack.py b/stgit/stack.py\nindex ea22d76..0253348 100644\n--- a/stgit/stack.py\n+++ b/stgit/stack.py\n@@ -88,7 +88,8 @@ def edit_file(series, line, comment, show_patch = True):\n     if show_patch:\n        print >> f, __patch_prefix\n        # series.get_patch(series.get_current()).get_top()\n-       git.diff([], series.get_patch(series.get_current()).get_bottom(), None, f)\n+       diff_str = git.diff(rev1 = series.get_patch(series.get_current()).get_bottom())\n+       f.write(diff_str)\n \n     #Vim modeline must be near the end.\n     print >> f, __comment_prefix, 'vi: set textwidth=75 filetype=diff nobackup:'\n"}]}