Search Results

Search found 4995 results on 200 pages for 'svn merge reintegrate'.

Page 165/200 | < Previous Page | 161 162 163 164 165 166 167 168 169 170 171 172  | Next Page >

• How to develop on a branch in HG

  - by michael

  Hi, I would like to do some experimental work in a hg project. So I would like to create branch, commit to it. And if the experiment works, I can merge it back to main branch. In git, I can do $git branch experimental $git checkout experimental (edit file) $ git commit -a $ git checkout master I read http://stevelosh.com/blog/2009/08/a-guide-to-branching-in-mercurial/, it said ' hg branch feature'. But what is next? I don't follow. I appreciate if you can help. Thank you.

  Read the article

• JPA EclipseLink Auditing for Oracle issue with SessionCustomizer...

  - by enrique

  I was trying to use the SessionCustomizer for auditing with v$session.program for oracle and it works with JDBC but i need it working with JPA, so i read a bit more the documentation for SESSION_CUSTOMIZER in this site: http://wiki.eclipse.org/Using_EclipseLink_JPA_Extensions_(ELUG)#EclipseLink_JPA_Persistence_Unit_Properties_for_Customization_and_Validation but had not lucky in making it work in passing the program name parameter to oracle with the v$session.program... i was using the SessionCustomizer and it is an interface so my code is as follows: package com.util; import org.eclipse.persistence.config.SessionCustomizer; import org.eclipse.persistence.sessions.Session; /** * * @author xkalibur */ public class ProgramCustomizer implements SessionCustomizer{ public void customize(Session s) throws Exception { s.getDatasourceLogin().setProperty("v$session.program","Customers"); } } then in CustomerFacade : ProgramCustomizer pc=new ProgramCustomizer(); public void edit(Customer customer) { emProperties.put(PersistenceUnitProperties.SESSION_CUSTOMIZER,pc); em=factory.createEntityManager(emProperties); em.merge(customer); } and returns the following error: javax.ejb.EJBException Caused by: java.lang.NullPointerException at com.facades.CustomerFacade.edit(CustomerFacade.java:48) please some help...

  Read the article

• Rails 4 json return on API

  - by El - Key

  I'm creating an API on my application. I currently overrided the as_json method in my model in order to be able to get attached files as well as logo from Paperclip : def as_json( options = {} ) super.merge(logo_small: self.logo.url(:small), logo_large: self.logo.url(:large), taxe: self.taxe, attachments: self.attachments) end Then within my controller, I'm doing : def index @products = current_user.products respond_with @products end def show respond_with @product end The problem is that on the index, I don't want get all the attachments. I only need it on the show method. So I tried it : def index @products = current_user.products respond_with @products, except: [:attachments] end But unfortunately it's not working. How can I do to not send :attachments? Thanks

  Read the article

• Microsoft Team System Equivalent stack.

  - by Nix

  I am looking for a free alternative to TS. What would be the best alternative stack(source control, bug tracking, project management/planning, wiki, automated builds (ci))? Keeping in mind that it would be nice if they all integrated well. For example, it would be nice to be able to link bugs to source control, and then be able to link to a project plan and then be able to automate building. I do not have issues with using Microsoft project to manage project planing. I know i would like to use these....: SVN TeamCity NUnit But i am struggling to find a good Wiki/Project Planning/Bug tracking, that would integrate well. Any questions let me know.

  Read the article

• Joomla Session Variable as Plugin Parameter

  - by dosboy

  I have a Joomla plugin which takes varying parameters. I need to retrieve one of these parameters from the current session. I've tried using Jumi and a little PHP snipped to retrieve the value and output it in the plugin's parameter list, but the Joomla plugin parser only handles the outter-most set of curly braces. ex. {fabrik view=table id=62 resetfilters=1 fab_tours_ro___tour_id=[tour_id]} [tour_id] I need to retrieve from the current session. I've tried {fabrik view=table id=62 resetfilters=1 fab_tours_ro___tour_id={jumi [scripts/get_tour_id.php]}} In that case the {jumi} tag never gets parsed. I could hack the {fabrik} plugin, but I'd prefer to do this without making any core or component changes, especially since I update Fabrik quite regularly via svn.

  Read the article

• Perform separate compilation of Latex documents

  - by ancechu

  When compiling latex documents the compiler emits a lot of "object" files. This clutters the directories I'm working on and it difficults the use of VCS like SVN. When I work with C++ code I have separate directories for the code and the objects, I can run make on the source directory but the .o files go to the build directory. Is there a proper way to perform this separate compilation with Latex documents? Can it be done by using Makefiles or by passing options to the latex compiler? Thanks

  Read the article

• Django i18n: makemessages only on site level possible?

  - by AndiDog

  I have several strings in my site that don't belong to any app, for example {% block title %}{% trans "Login" %}{% endblock %} or a modified authentication form used to set the locale cookie class AuthenticationFormWithLocaleOption(AuthenticationForm): locale = forms.ChoiceField(choices = settings.LANGUAGES, required = False, initial = preselectedLocale, label = _("Locale/language")) Now when I execute django-admin.py makemessages --all -e .html,.template in the site directory, it extracts the strings from all Python, .html and .template files, including those in my apps. That is because I develop my apps inside that directory: Directory structure: sitename myapp1 myapp2 Is there any way to extract all strings that are not in my apps? The only solution I found is to move the app directories outside the site directory structure, but I'm using bzr-externals (similar to git submodules or svn externals) so that doesn't make sense in my case. Moving stuff that needs translation into a new app is also possible but I don't know if that is the only reasonable solution.

  Read the article

• Generate a collection of changed lines between two revisions of a file using Java

  - by mchr

  I am writing an eclipse plugin which needs to be able to determine which lines of a file have changed compared to a different version of the same file. Is there an existing class or library which I can use for this task? The closest I have found is org.eclipse.compare.internal.merge.DocumentMerger. This can be used to find the information I need but is in an internal package so is not suitable for me to use. I could copy/paste the source of this class and adapt it to my requirements. However, I am hoping there is an existing library to handle textual comparisons.

  Read the article

• Which source control to use (for a lot of images file)?

  - by invisal

  I finally decide to give a source control a try with my existed project (since I will be hiring another new developer soon). I am pretty new to this area and I need recommendation which Source Control should I use to fix my current project. I am developing Web Application which dealing with large number of pictures. Currently, we have over 500,000 pictures (large size picture and several thumbnails). I am using PHP which is not what I concern (since it is just only hundred of script files). My major concern is with the large amount of picture. NOTE: I just install VisualSVN. What do you think about SVN. Do you think it will fix to my requirement?

  Read the article

• Can Spring understand @Inject replacing Weld as a JSR-299 implementation?

  - by Thorbjørn Ravn Andersen

  I have noticed from several web pages that apparently Spring 3.0 supports @Inject from JSR-330. As we would really like to use JSR-299 syntax for dependency injection in our libraries for both web apps and stand-alone applications, and have alternatives to Weld, it would be nice if Spring could do this. Being a novice to Spring, I tried downloading the Spring Framework distribution and put all jars on the Eclipse build path. No Inject annotation so my existing test project using Weld did not compile. Can this be done with Spring? What do I need to do to get it running? (I am aware that Guice eventually will support this too. It is only in SVN for now, and if there is an official Spring release which can, that would be better.)

  Read the article

• Custom Trigger Scripts for Bot (Xcode 5 CI)

  - by Mishal Shah

  I am working on setting up CI for my iOS application and I am facing some issues. Where is a good place to find documents on Bot? I have seen the Xcode help but cant find any good example, also watched the CI video from 2013 conference How do i create a custom trigger script, so every time a developer commits their code it will automatically trigger the bot. How do I merge the code to master only if Test successfully passes the bot? Here is where I found info about trigger scripts https://help.apple.com/xcode/mac/1.0/#apdE6540C63-ADB5-4B07-89B7-6223EC40B59C Example values are shown with each setting. Schedule: Choose to run manually, periodically, on new commits, or on trigger scripts. Thank you!

  Read the article

• What is a good reporting service for a simple database/hobbyist setup?

  - by Zombies

  I have a meager production environment running on my PC for a little application that I work on in my spare time. At this point I have the basics setup, MySQL, junit, svn... I am midway through development and I now need to generate various reports. These reports are based on what data is in the database.... Now, my question is this: Is there an existing reporting tool that accepts SQL and generates various reports (via: email, PDF, etc). Some tool which makes writing new reports easy, while also having a somewhat robust set of features. Does this software exist or must I write all of these reports myself?

  Read the article

• Obj-C/Cocoa: Use of Shortcut Recorder Framework, how?

  - by Eike Cochu

  to capture keystrokes for registering global hotkeys i want to use the shortcut recorder. but i can't get it to work. here is what i have done so far: checked out the current version from the svn installed xcode 3 because my xcode 4 wouldn't build, then built it with xcode 3 in xcode 4, i added the shortcutrecorder.framework in the build-directory to my application, dragged/copied the SRRecorderControl.h to my application directory and inserted #import "SRRecorderControl.h" to my AppDelegate.h when i build and run, it fails and says images not found. i know that there are images in the shortcut recorder main directory, but i dont know where to put these. and: how do i add the special shortcut recorder textfield to my main window?

  Read the article

• Preferred menus for C# application.

  - by SeaDrive

  Which of the menu tools do you use for C# windows applications? I began with MainMenu, but when I moved to VS2005, only MenuStrip appeared in the Toolbox, so I assumed it was new and better. However, the merge/replace action seems to require a lot more time and effort, and leave one open to maintenance problems. (Perhaps my real question is "what were they thinking when they created MenuStrip?) Do you drag/drop the menus, or do you write the code? Do you use MainMenu, MenuStrip, or some other alternatives?

  Read the article

• How do I list all cron jobs for all users?

  - by yukondude

  Is there a command or an existing script that will let me view all of a *NIX system's scheduled cron jobs at once? I'd like it to include all of the user crontabs, as well as /etc/crontab, and whatever's in /etc/cron.d. It would also be nice to see the specific commands run by run-parts in /etc/crontab. Ideally, I'd like the output in a nice column form and ordered in some meaningful way. I could then merge these listings from multiple servers to view the overall "schedule of events." I was about to write such a script myself, but if someone's already gone to the trouble...

  Read the article

• Finding mySQL duplicates, then merging data

  - by Michael Pasqualone

  I have a mySQL database with a tad under 2 million rows. The database is non-interactive, so efficiency isn't key. The (simplified) structure I have is: `id` int(11) NOT NULL auto_increment `category` varchar(64) NOT NULL `productListing` varchar(256) NOT NULL Now the problem I would like to solve is, I want to find duplicates on productListing field, merge the data on the category field into a single result - deleting the duplicates. So given the following data: +----+-----------+---------------------------+ | id | category | productListing | +----+-----------+---------------------------+ | 1 | Category1 | productGroup1 | | 2 | Category2 | productGroup1 | | 3 | Category3 | anotherGroup9 | +----+-----------+---------------------------+ What I want to end up is with: +----+----------------------+---------------------------+ | id | category | productListing | +----+----------------------+---------------------------+ | 1 | Category1,Category2 | productGroup1 | | 3 | Category3 | anotherGroup9 | +----+----------------------+---------------------------+ What's the most efficient way to do this either in pure mySQL query or php?

  Read the article

• Combining 2xMSI and 1xEXE into a single installer

  - by Netguy

  Hi Guys , I have 3 files - Alky for Applications.msi ( which make Vista Apps work on XP) Windows Vista sidebar.exe ( Which make that VIsta sidebar work on XP) Gadget Extractor.msi (A part of number 2) Now, the problem is that all the 3 applications are installers and I want to merge them to 1 installer. So please tell me what should I do and I also want to remove some content (normal files) from 2. Note: I do NOT want to bind the files, so that 3 installers start at the same time. I want to make them into one The Person who is able to help me gets a VPS with cPanel with RL/TF allowed :D

  Read the article

• Continuous integration with multiple branch development

  - by ryanprayogo

  In the project that I'm working on, we are using SVN with 'Stable Trunk' strategy. What that means is that for each bug that is found, QA opens a bug ticket and assigns it to a developer. Then, a developer fixes that bug and checks it in a branch (off trunk, let's call this the bug branch) and that branch will only contain fixes for that particular bug ticket When we decided to do a release, for each bug fixes that we want to release to the customer, a developer will merge all the fixes from several bug branch to trunk and proceed with the normal QA cycle. The problem is that we use trunk as the codebase for our CI job (Hudson, specifically), and therefore, for all commits to the bug branch, it will miss the daily build until it gets merged to trunk when we decided to release the new version of the software. Obviously, that defeats the purpose of having CI. What is the proper way to fix this issue?

  Read the article

• WCF REST Service not working - not showing anything

  - by casperrawr

  I've been scratching my head for the past 20 hrs or so trying to figure out what is wrong with my rudimentary WCF app but with absolutely no luck :( I was following this tutorial: http://www.c-sharpcorner.com/UploadFile/dhananjaycoder/RESTEnabledService05122009034907AM/RESTEnabledService.aspx and for some reason the WCF is showing a blank page. I checked IIS, reinstalled .NET 4.0, cleaned and redid .svn handlers, tried on different test servers...and still, nada. Do you know what might be wrong with the configuration? I figured the code is simple enough (essentially the same as the page I posted) so it can't be the code itself...right? any help will be appreciate :)

  Read the article

• Can I compose a WCF callback contract out of multiple interfaces?

  - by mafutrct

  Followup question to http://stackoverflow.com/questions/2502930/how-can-i-compose-a-wcf-contract-out-of-multiple-interfaces. I tried to merge multiple callback interfaces in a single interface. This yields an InvalidOperationException claiming that the final interface contains no operations. Technically, this is true, however, the inherited interfaces do contain operations. How can I fix this? Or is this a limitation of WCF? Edit: interface A { [OperationContract]void X(); } interface B { [OperationContract]void Y(); } interface C: A, B {} // this is the public callback contract

  Read the article

• Why is Postgres doing a Hash in this query?

  - by Claudiu

  I have two tables: A and P. I want to get information out of all rows in A whose id is in a temporary table I created, tmp_ids. However, there is additional information about A in the P table, foo, and I want to get this info as well. I have the following query: SELECT A.H_id AS hid, A.id AS aid, P.foo, A.pos, A.size FROM tmp_ids, P, A WHERE tmp_ids.id = A.H_id AND P.id = A.P_id I noticed it going slowly, and when I asked Postgres to explain, I noticed that it combines tmp_ids with an index on A I created for H_id with a nested loop. However, it hashes all of P before doing a Hash join with the result of the first merge. P is quite large and I think this is what's taking all the time. Why would it create a hash there? P.id is P's primary key, and A.P_id has an index of its own.

  Read the article

• Playing around with my Java project in Eclipse... what the crap did I just do?

  - by Daddy Warbox

  I don't even remember how, but somehow I managed to make all of my project's source files hidden in Eclipse's Package and Project Explorer panels. Go figure. 'Show Filtered Children (alt+click)' temporarily reveals the files, and only in Package Explorer can I double-click to reopen them from this view. They go back into hiding after I select another item, though. Plus, now I'm getting other annoyances, such as all of the folded non-hidden items altogether expanding when I click on an item, and the entire folder tree of my project now being shown in these panels (including my .svn subversion folders... which shouldn't be any of Eclipse's business, presently). Long story short, my Package/Project Explorers' just blew up on me, and I want to know how to fix this. Thanks in advance. P.S. What's a good guide I can use to learn my way around this silly contraption, anyway?

  Read the article

• How to handle images folder with many images

  - by Billy

  I'm developing a new aspnet website with 200k images in a /Images/ -folder. Many operations in Visual Studio is slow because it access the folder, adding a web service takes 10 minutes. The images is not checked into scm (svn). How should I structure the tree of code, to improve performance in VS? It would also be neat if not all developers needed to copy 200k images to their local disk to be able to develop on the site. Images as DB blobs is not an option.

  Read the article

• Violation of primary key constraint, multiple users

  - by MC.

  Lets say UserA and UserB both have an application open and are working with the same type of data. UserA inserts a record into the table with value 10 (PrimaryKey='A'), UserB does not currently see the value UserA entered and attempts to insert a new value of 20 (PrimaryKey='A'). What I wanted in this situation was a DBConcurrencyException, but instead what I have is a primary key violation. I understand why, but I have no idea how to resolve this. What is a good practice to deal with such a circumstance? I do not want to merge before updating the database because I want an error to inform the user that multiple users updated this data.

  Read the article

• Single SQL Server Result Set from Query

  - by JamesC

  Hi Please advise on how to merge two results in to one using SQL Server 2005. I have the situation where an Account can have up to two Settlement Instructions and this have been modeled like so: The slim-ed down schema: Account --------------------- Id AccountName PrimarySettlementId (nullable) AlternateSettlementId (nullable) SettlementInstruction ---------------------- Id Name The output I want is a single result set with a select statement something along the lines of this which will allow me to construct some java objects in my Spring row mapper: select Account.Id as accountId, Account.AccountName as accountName, s1.Id as primarySettlementId, s1.Name as primarySettlementName, s2.Id as alternateSettlementId, s2.Name as alternateSettlementName I've tried various things but cannot find a way to get the result set merged in to one where the primary and alternate FK's are not null. Finally I have searched the forum, but nothing quite seems to fit with what I need.

  Read the article

< Previous Page | 161 162 163 164 165 166 167 168 169 170 171 172  | Next Page >