Re: Rietveld patchy: test run

[David Kastrup]

Graham Percival <address@hidden> writes:

> On Thu, Feb 23, 2012 at 04:55:06PM -0500, Julien Rioux wrote:
>> On 15/02/2012 9:14 AM, Julien Rioux wrote:
>> >I modified Graham's Rietveld patchy to fix two issues:  [...]
>> >This new version should be tested before I send a formal pull request.
>> 
>> If anyone is interested I have gone through the testing and sent a
>> pull request that you can see here:
>> https://github.com/gperciva/lilypond-extra/pull/11
>
> Thanks, merged.

It does not really make _any_ sense then to continue messing with
master, I think.

>From b4275d0678eedd6b306df5271af48aaa1ed8c0eb Mon Sep 17 00:00:00 2001
From: David Kastrup <address@hidden>
Date: Sun, 5 Feb 2012 10:43:07 +0100
Subject: [PATCH] Revert "Patchy: update master after pushing"

This reverts commit 42980f8b6e677be8bb4e2c44f970efd947bc8f4e.
---
 patches/compile_lilypond_test.py |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/patches/compile_lilypond_test.py b/patches/compile_lilypond_test.py
index a87456b..f18ea9d 100755
--- a/patches/compile_lilypond_test.py
+++ b/patches/compile_lilypond_test.py
@@ -237,10 +237,6 @@ class AutoCompile():
         os.chdir(self.git_repository_dir)
         run("git push origin test-master-lock:master")
         self.logfile.add_success("pushed to master\n")
-        ### update its own master
-        run("git fetch")
-        run("git checkout master")
-        run("git rebase origin/master")
         # TODO: update dev/staging in some way?
 
     def remove_test_master_lock(self):
-- 
1.7.5.4


-- 
David Kastrup