From notifications-return-30389-apmail-ofbiz-notifications-archive=ofbiz.apache.org@ofbiz.apache.org Wed Feb 5 17:28:03 2020 Return-Path: X-Original-To: apmail-ofbiz-notifications-archive@minotaur.apache.org Delivered-To: apmail-ofbiz-notifications-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by minotaur.apache.org (Postfix) with SMTP id C658B191D3 for ; Wed, 5 Feb 2020 17:28:02 +0000 (UTC) Received: (qmail 36368 invoked by uid 500); 5 Feb 2020 17:28:02 -0000 Delivered-To: apmail-ofbiz-notifications-archive@ofbiz.apache.org Received: (qmail 36351 invoked by uid 500); 5 Feb 2020 17:28:02 -0000 Mailing-List: contact notifications-help@ofbiz.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ofbiz.apache.org Delivered-To: mailing list notifications@ofbiz.apache.org Received: (qmail 36342 invoked by uid 99); 5 Feb 2020 17:28:02 -0000 Received: from mailrelay1-us-west.apache.org (HELO mailrelay1-us-west.apache.org) (209.188.14.139) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Feb 2020 17:28:02 +0000 Received: from jira-he-de.apache.org (static.172.67.40.188.clients.your-server.de [188.40.67.172]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 08E2AE2F8D for ; Wed, 5 Feb 2020 17:28:01 +0000 (UTC) Received: from jira-he-de.apache.org (localhost.localdomain [127.0.0.1]) by jira-he-de.apache.org (ASF Mail Server at jira-he-de.apache.org) with ESMTP id 3B0A27804C4 for ; Wed, 5 Feb 2020 17:28:00 +0000 (UTC) Date: Wed, 5 Feb 2020 17:28:00 +0000 (UTC) From: "Jacques Le Roux (Jira)" To: notifications@ofbiz.apache.org Message-ID: In-Reply-To: References: Subject: [jira] [Comment Edited] (OFBIZ-11329) setUserTimeZone should ran only once based on error MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394 [ https://issues.apache.org/jira/browse/OFBIZ-11329?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17030832#comment-17030832 ] Jacques Le Roux edited comment on OFBIZ-11329 at 2/5/20 5:27 PM: ----------------------------------------------------------------- Since you are interested in: {noformat} Since you are interested in: Jacques@LDLC MINGW64 /c/projectsASF/Git/ofbiz-framework (trunk) $ git pull First, rewinding head to replay your work on top of it... Applying: Improved: Updated plugins url in release17.12 Using index info to reconstruct a base tree... M build.gradle Falling back to patching base and 3-way merge... Auto-merging build.gradle CONFLICT (content): Merge conflict in build.gradle Staged 'build.gradle' using previous resolution. error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Improved: Updated plugins url in release17.12 Resolve all conflicts manually, mark them as resolved with "git add/rm ", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". Jacques@LDLC MINGW64 /c/projectsASF/Git/ofbiz-framework (trunk|REBASE 1/130) $ Jacques@LDLC MINGW64 /c/projectsASF/Git/ofbiz-framework (trunk|REBASE 1/130) $ Jacques@LDLC MINGW64 /c/projectsASF/Git/ofbiz-framework (trunk|REBASE 1/130) $ git rebase --skip Applying: "Applied fix from trunk for revision: 1819805" Using index info to reconstruct a base tree... M themes/rainbowstone/ofbiz-component.xml M themes/rainbowstone/template/includes/TopAppBar.ftl Falling back to patching base and 3-way merge... Auto-merging themes/rainbowstone/template/includes/TopAppBar.ftl CONFLICT (add/add): Merge conflict in themes/rainbowstone/config/rainbowstone.properties Auto-merging themes/rainbowstone/config/rainbowstone.properties Recorded preimage for 'themes/rainbowstone/config/rainbowstone.properties' error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0002 "Applied fix from trunk for revision: 1819805" Resolve all conflicts manually, mark them as resolved with "git add/rm ", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". Jacques@LDLC MINGW64 /c/projectsASF/Git/ofbiz-framework (trunk|REBASE 2/130) $ git rebase --abort Jacques@LDLC MINGW64 /c/projectsASF/Git/ofbiz-framework (trunk) $ git pull First, rewinding head to replay your work on top of it... Applying: Improved: Updated plugins url in release17.12 Using index info to reconstruct a base tree... M build.gradle Falling back to patching base and 3-way merge... Auto-merging build.gradle CONFLICT (content): Merge conflict in build.gradle Staged 'build.gradle' using previous resolution. error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Improved: Updated plugins url in release17.12 Resolve all conflicts manually, mark them as resolved with "git add/rm ", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". Jacques@LDLC MINGW64 /c/projectsASF/Git/ofbiz-framework (trunk|REBASE 1/130) $ git am --show-current-patch commit 4c65b791a0db7e2738dd6fd0c56cbd63f147d695 Author: Deepak Dixit Date: Thu Dec 28 10:11:00 2017 +0000 Improved: Updated plugins url in release17.12 git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1819413 13f79535-47bb-0310-9956-ffa450edef68 diff --git a/build.gradle b/build.gradle index 05b8e4fca2..8bab70657d 100644 --- a/build.gradle +++ b/build.gradle @@ -754,7 +754,7 @@ task pullPluginSource(group: ofbizPlugin, description: 'Download and install a p if (project.hasProperty('pluginId')) { task pullPluginFromSvn(type: SvnCheckout) { - svnUrl = "https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk/${pluginId}" + svnUrl = "https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12/${pluginId}" workspaceDir = "${pluginsDir}/${pluginId}" } dependsOn pullPluginFromSvn @@ -771,7 +771,7 @@ task pullAllPluginsSource(group: ofbizPlugin, doLast { delete "${pluginsDir}" } } task pullPluginsFromSvn(type: SvnCheckout, dependsOn: deleteBeforePulling) { - svnUrl = "https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk" + svnUrl = "https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12" workspaceDir = "${pluginsDir}" } dependsOn pullPluginsFromSvn Jacques@LDLC MINGW64 /c/projectsASF/Git/ofbiz-framework (trunk|REBASE 1/130) $ {noformat} Then I got my stash, previous to backport, clean... pfew... was (Author: jacques.le.roux): Since you are interested in: {noformat} Jacques@LDLC MINGW64 /c/projectsASF/Git/ofbiz-framework (trunk|REBASE 1/130) $ git rebase --skip Applying: "Applied fix from trunk for revision: 1819805" Using index info to reconstruct a base tree... M themes/rainbowstone/ofbiz-component.xml M themes/rainbowstone/template/includes/TopAppBar.ftl Falling back to patching base and 3-way merge... Auto-merging themes/rainbowstone/template/includes/TopAppBar.ftl CONFLICT (add/add): Merge conflict in themes/rainbowstone/config/rainbowstone.properties Auto-merging themes/rainbowstone/config/rainbowstone.properties Recorded preimage for 'themes/rainbowstone/config/rainbowstone.properties' error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0002 "Applied fix from trunk for revision: 1819805" Resolve all conflicts manually, mark them as resolved with "git add/rm ", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". Jacques@LDLC MINGW64 /c/projectsASF/Git/ofbiz-framework (trunk|REBASE 2/130) $ git rebase --abort Jacques@LDLC MINGW64 /c/projectsASF/Git/ofbiz-framework (trunk) $ git pull First, rewinding head to replay your work on top of it... Applying: Improved: Updated plugins url in release17.12 Using index info to reconstruct a base tree... M build.gradle Falling back to patching base and 3-way merge... Auto-merging build.gradle CONFLICT (content): Merge conflict in build.gradle Staged 'build.gradle' using previous resolution. error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Improved: Updated plugins url in release17.12 Resolve all conflicts manually, mark them as resolved with "git add/rm ", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". Jacques@LDLC MINGW64 /c/projectsASF/Git/ofbiz-framework (trunk|REBASE 1/130) $ git am --show-current-patch commit 4c65b791a0db7e2738dd6fd0c56cbd63f147d695 Author: Deepak Dixit Date: Thu Dec 28 10:11:00 2017 +0000 Improved: Updated plugins url in release17.12 git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1819413 13f79535-47bb-0310-9956-ffa450edef68 diff --git a/build.gradle b/build.gradle index 05b8e4fca2..8bab70657d 100644 --- a/build.gradle +++ b/build.gradle @@ -754,7 +754,7 @@ task pullPluginSource(group: ofbizPlugin, description: 'Download and install a p if (project.hasProperty('pluginId')) { task pullPluginFromSvn(type: SvnCheckout) { - svnUrl = "https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk/${pluginId}" + svnUrl = "https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12/${pluginId}" workspaceDir = "${pluginsDir}/${pluginId}" } dependsOn pullPluginFromSvn @@ -771,7 +771,7 @@ task pullAllPluginsSource(group: ofbizPlugin, doLast { delete "${pluginsDir}" } } task pullPluginsFromSvn(type: SvnCheckout, dependsOn: deleteBeforePulling) { - svnUrl = "https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk" + svnUrl = "https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12" workspaceDir = "${pluginsDir}" } dependsOn pullPluginsFromSvn Jacques@LDLC MINGW64 /c/projectsASF/Git/ofbiz-framework (trunk|REBASE 1/130) {noformat} At this stage better solution: {noformat} git fetch origin git reset --hard origin/master {noformat} Then I got my stash, previous to backport, clean... pfew... > setUserTimeZone should ran only once based on error > --------------------------------------------------- > > Key: OFBIZ-11329 > URL: https://issues.apache.org/jira/browse/OFBIZ-11329 > Project: OFBiz > Issue Type: Sub-task > Components: framework, webpos > Affects Versions: Trunk > Reporter: Jacques Le Roux > Assignee: James Yong > Priority: Minor > Attachments: OFBIZ-11329-plugins.patch, OFBIZ-11329.patch, OFBIZ-11329.patch > > > This will be useful when committing CSRF solution as explained in OFBIZ-11306 -- This message was sent by Atlassian Jira (v8.3.4#803005)