summaryrefslogtreecommitdiff
path: root/windowPublish.go
diff options
context:
space:
mode:
Diffstat (limited to 'windowPublish.go')
-rw-r--r--windowPublish.go31
1 files changed, 16 insertions, 15 deletions
diff --git a/windowPublish.go b/windowPublish.go
index 7e1e956..85708a9 100644
--- a/windowPublish.go
+++ b/windowPublish.go
@@ -7,7 +7,6 @@ package main
import (
"go.wit.com/lib/gadgets"
- "go.wit.com/log"
)
// Publish Window
@@ -17,24 +16,26 @@ func makePublishWindow() *gadgets.GenericWindow {
grid := pubWin.Group.RawGrid()
grid.NewButton("merge all patches to master", func() {
- pubWin.Disable()
- defer pubWin.Enable()
+ /*
+ pubWin.Disable()
+ defer pubWin.Enable()
- if err := doAllCheckoutDevel(); err != nil {
- log.Info("checkout error:", err)
- } else {
- log.Info("checkout was ok")
- }
+ if err := doAllCheckoutDevel(); err != nil {
+ log.Info("checkout error:", err)
+ } else {
+ log.Info("checkout was ok")
+ }
- mergeUserToDevel(true)
+ mergeUserToDevel(true)
- if err := doAllCheckoutMaster(); err != nil {
- log.Info("checkout error:", err)
- } else {
- log.Info("checkout was ok")
- }
+ if err := doAllCheckoutMaster(); err != nil {
+ log.Info("checkout error:", err)
+ } else {
+ log.Info("checkout was ok")
+ }
- mergeDevelToMaster(true)
+ mergeDevelToMaster(true)
+ */
})
return pubWin