[nvda-addons] Re: commit/addonFiles: josephsl: Added CUA to cron

  • From: "Joseph Lee" <joseph.lee22590@xxxxxxxxx>
  • To: <nvda-addons@xxxxxxxxxxxxx>
  • Date: Thu, 7 Apr 2016 11:17:09 -0700

Hi,

Might be. One solution is forced override – svn2addon, then try committing
changes.

Cheers,

Joseph

 

From: nvda-addons-bounce@xxxxxxxxxxxxx
[mailto:nvda-addons-bounce@xxxxxxxxxxxxx] On Behalf Of Noelia
Sent: Thursday, April 7, 2016 8:17 AM
To: nvda-addons@xxxxxxxxxxxxx
Subject: [nvda-addons] Re: commit/addonFiles: josephsl: Added CUA to cron

 

Hi, I have run addon2svn adn get this bug. I don't know why: perhaps before
enabling translations workflow there was po files included manually. I don't
know.
Thanks.

***

error: Your local changes to the following files would be overwritten by
merge:
        addon/locale/da/LC_MESSAGES/nvda.po
        addon/locale/pl/LC_MESSAGES/nvda.po
        addon/locale/ta/LC_MESSAGES/nvda.po
Please, commit your changes or stash them before you can merge.
Aborting
mr addon2svn: command failed

mr addon2svn: finished (1 failed)
nvdal10n@exbi:~/mr/addons/controlUsageAssistant$ ~

El 07/04/2016 a las 7:28, Joseph Lee escribió:

Hi,

Mostly for Derek and Noelia: I have enabled workflow for Control Usage
Assistant. If no outstanding errors are found, then we can declare start of
3.0-dev development.

Cheers,

Joseph

 

From: nvda-addons-commits-bounce@xxxxxxxxxxxxx
<mailto:nvda-addons-commits-bounce@xxxxxxxxxxxxx>
[mailto:nvda-addons-commits-bounce@xxxxxxxxxxxxx] On Behalf Of
commits-noreply@xxxxxxxxxxxxx <mailto:commits-noreply@xxxxxxxxxxxxx> 
Sent: Wednesday, April 6, 2016 10:26 PM
To: nvda-addons-commits@xxxxxxxxxxxxx
<mailto:nvda-addons-commits@xxxxxxxxxxxxx> 
Subject: commit/addonFiles: josephsl: Added CUA to cron

 

1 new commit in addonFiles:

https://bitbucket.org/nvdaaddonteam/addonfiles/commits/e556e4bb705a/
Changeset: e556e4bb705a Branch: master User: josephsl Date: 2016-04-07
05:25:51+00:00 Summary: Added CUA to cron

Affected #: 1 file

diff --git a/automatic.crontab b/automatic.crontab index 77e2676..11935db
100644 --- a/automatic.crontab +++ b/automatic.crontab @@ -37,6 +37,7 @@
poStatusHtml=/home/nvdal10n/ikiwiki/publish/poStatus.html

#x  3 for addons starting with c
00  3 * * fri cd ${PathToMrRepo}/addons/clipContentsDesigner && chronic mr
addon2svn && chronic mr svn2addon

+05 3 * * fri cd ${PathToMrRepo}/addons/controlUsageAssistant && chronic mr
addon2svn && chronic mr svn2addon

#x  4 for addons starting with d
00  4 * * fri cd ${PathToMrRepo}/addons/dayOfTheWeek && chronic mr addon2svn
&& chronic mr svn2addon

Repository URL: https://bitbucket.org/nvdaaddonteam/addonfiles/

—

This is a commit notification from bitbucket.org. You are receiving this
because you have the service enabled, addressing the recipient of this
email.



 

JPEG image

Other related posts:

  1. Home
  2. nvda-addons
  3. Archive
  4. 04-2016