Monthly Archives

Articles indexed in June 2010

Page 143/1794 | < Previous Page | 139 140 141 142 143 144 145 146 147 148 149 150  | Next Page >

  • Merge changes when a file on a branch has split into two files on the master

    - by carleeto
    This is basically the result of a massive class C on the master having been refactored down the line into two smaller classes, C1 and C2. C was then made a subclass of C2 and cut down to a skeletal version for backward compatibility. So from that point on, master contained C, C1 and C2. On that master commit git said C was renamed to C1. The branch was last updated before this happened. (All C++ code, if it helps to visualize the files involved) Obviously, when I tried a rebase of the branch onto master, there were conflicts that needed to be resolved. As usual, I used mergetool. So now the mergetool comes up with the following: On Local, I have the skeletal version of C. Base and Remote have a bunch of changes to C. Because the skeletal version of C exists on Local, I conclude that the changes from Base and Remote should actually go into C1, leaving C alone. My question is, how do I do this?

    Read the article

  • StackOverflow Site Layout Problem in Chrome

    - by Laramie
    I was cleaning up one of my questions here and noticed that Stack Overflow's comments were overflowing into the right column in Chrome. The question is, what's the difference in CSS handling between Chrome and Firefox. I don't have access to Safari, Opera, et al. Can someone tell me in which browsers the error manifests? Is it just me? Here's the layout error: (my apologies to Tim Down for covering up his name with my comment bubble) Since I have no natural skill for good layouts and the whole process makes me sad, I wonder if someone can diagnose the error on StackOverflow and make a recommendation on how to avoid it. Is this a consequence of embedding a div inside a td? Plus I admit it. It's fun to point out an error on one of the greatest sites ever.

    Read the article

  • Should Databases be used just for persistence

    - by Raju
    A lot of web applications having a 3 tier architecture are doing all the processing in the app server and use the database for persistence just to have database independence. After paying a huge amount for a database, doing all the processing including batch at the app server and not using the power of the database seems to be a waste. I have a difficulty in convincing people that we need to use best of both worlds.

    Read the article

  • Windows 2008 R2 server cannot access shares on other servers

    - by Rob
    I have a problem on my new 2008 R2 64-bit server. Essentially the server sometimes refuses to access shares on other server. in the format \\servernam\sharename sometime it works and then for a few hours it doesn't and then at randon it comes back online. This is a local AD network and have even put in a new gigabit switch between all server. All the old 2003 servers work fine so I know DNS and WINS is all ok. I get error 1006 in eventlog saying that my R2 server can't contact the domain controller when it clearly can. Just to add to the config, it is running on a Dell PowerEdge R410, Vmware Esxi 4.0 and R2 is configured as a terminal server. I can always view shares with FQDN This morning net view \\ did not work but net view \\ did. Very random and very frustrating. any ideas? thanks

    Read the article

  • Function From C to Delphi

    - by XBasic3000
    I created a function similar below in delphi code. but it wont work. What is the proper way to convert this? char* ReadSpeechFile(char* pFileName, int *nFileSize) { char *szBuf, *pLinearPCM; int nSize; FILE* fp; //read wave data fp = fopen(pFileName, "rb"); if(fp == NULL) return NULL; fseek(fp, 0, SEEK_END); nSize = ftell(fp); //linear szBuf = (char *)calloc(nSize, sizeof(char)); fseek(fp, 0, SEEK_SET); fread(szBuf, sizeof(char), nSize, fp); fclose(fp); *nFileSize = nSize; return szBuf; }

    Read the article

  • Setting up MySQL database

    - by mathew
    I do have single database and near about 11 tables. while my web page is opening informations from these 11 tables will be accessed same time. according to my current settings what I did now is for each table database is opening and closing. say I had given username and password to open databse for each table and close after retrieving information from that table. Is this the right way to do it?? I feel because of this the database is opeing and closing 11 times!!!! Am I right?? is this the right way to do that?? Oh well I do have some tables which update date is differ from others... THanks Mathew

    Read the article

  • Spring Jdbc Template + MySQL = TransientDataAccessResourceException : Invalid Argument Value : Java.

    - by Vanchinathan
    I was using spring jdbc template to insert some data into the database and I was getting this error. Here is my code : JdbcTemplate insert = new JdbcTemplate(dataSource); for(ResultType result : response.getResultSet().getResult()) { Object[] args = new Object[] {result.getAddress(), result.getCity(), result.getState(), result.getPhone(), result.getLatitude(), result.getLongitude(),result.getRating().getAverageRating(), result.getRating().getAverageRating(), result.getRating().getTotalRatings(), result.getRating().getTotalReviews(), result.getRating().getLastReviewDate(), result.getRating().getLastReviewIntro(), result.getDistance(), result.getUrl(), result.getClickUrl(), result.getBusinessUrl(), result.getBusinessClickUrl()}; insert.update("INSERT INTO data.carwashes ( address, city, state, phone, lat, lng, rating, average_rating, total_ratings, total reviews, last_review_date, last_review_intro, distance, url, click_url, business_url, business_click_url, category_id, zipcode_id) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,96925724,78701)", args); } Quite lengthy code.. but, basically it gets the value from a object and sticks it to a array and passed that array to insert method of jdbc template. Any help will be appreciated.

    Read the article

  • How to call a function from another function in c++?

    - by karikari
    I have this function definition inside my cpp file; LRESULT CRebarHandler::onSetRedraw(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { bHandled=false; if (m_ieVer==6){ if (!m_hWndToolbar) scanForToolbarSlow(); } return S_OK; } My problem is I don't know how to call it from another function inside the same file. I want to call it from this function: void CRebarHandler::setButtonMenu2(){ bool b=false; onSetRedraw(0,0,0,false); <------ is this the correct way? } Must I provide all the 4 values? Can I just send no value? Help me..

    Read the article

  • Updating from svn repository returns "Could not read chunk size" error

    - by Denis
    When updating from subversion repository using tortoise svn client I get error looking like that: Could not read chunk size: An existing connection was forcibly closed by the remote host. It doesn't prevent me from updating, just interrupts update process, so that I have to repeat update several times, before it is complete. What can cause such behaviour and how to fix it?

    Read the article

  • "Access is denied" iFrame IE

    - by Tom
    I have an iframe in b.com which attempts to grab the jQuery library from a.com [my website]. Whenever it does this I get the "Access is Denied" error in both IE7 and IE8. I have checked out Fiddler and it doesnt show that the script is getting blocked - but IE does errors with "Access is Denied" What is causing this prob and how to get around it ? Thx

    Read the article

  • java applet - array checking

    - by Dan
    OK so my code is here: http://www.so.pastebin.com/m7V8rQ2n What I want to know... let's say I have an image which I can redraw on tiles... is there a way to check for future tiles so I DON'T go out of bounds of my already defined tile map? Like if I were at the edge of a map... it would NOT let me go past it? Thanks.

    Read the article

  • how to get inline javascript to fire with jQuery

    - by lloydphillips
    I have a javascript action on a div (asp.net panel) as an onkeypress attribute. This is the default action button on an asp.net Panel control. It contains the following: onkeypress="javascript:return WebForm_FireDefaultButton(event, 'ctl00_cp1_ucInvoiceSearch_btnSearch')" For some reason when I change my textbox to a jQuery textbox clicking enter no longer fires this div. Why and how can I hook it back up so when I enter text in the textbox and click enter it fires? Lloyd

    Read the article

  • inheritance from the django user model results in error when changing password

    - by Jerome
    I inherited form the django user model like so: from django.db import models from django.contrib.auth.models import User, UserManager from django.utils.translation import ugettext_lazy as _ class NewUserModel(User): custom_field_1 = models.CharField(_('custom field 1'), max_length=250, null=True, blank=True) custom_field_2 = models.CharField(_('custom field 2'), max_length=250, null=True, blank=True) objects = UserManager() When i go to the admin and add an entry into this model, it saves fine, but below the "Password" field where it has this text "Use '[algo]$[salt]$[hexdigest]' or use the change password form.", if i click on the "change password form' link, it produces this error Truncated incorrect DOUBLE value: '7/password' What can i do to fix this?

    Read the article

  • Should I enter my Office product key before running sysprep?

    - by stickmangumby
    I'm planning on cloning a Windows XP install, and am a little confused about sysprep. I know that it blanks out the XP product key, but what about other software? If I install Office 2007 and enter a product key, then use sysprep and create an image, will I be able to enter a new product key in clones I create from the image? Or will they all have duplicate product keys?

    Read the article

  • How to disable "Attachment Execution Service" in Windows?

    - by netvope
    If I run an executable file downloaded from the Internet, Windows displays a warning that this file can potentially harm my computer. This happens even for files downloaded by Firefox (not just IE.) On networked drive, this seems to slow down program launch time a lot. From Wikipedia, I learned that the feature is called "Attachment Execution Service". How can I completely disable it? If this cannot be done, how can I instruct Firefox not to set the "downloaded" flag on the file?

    Read the article

  • Questions about Wordpress 3.0 RC

    - by Nimbuz
    I'm looking to upgrade my blog from Wordpress 2.5 to 3.0 RC, but I'm not sure if: List item It is stable? It will support existing v2.5 plugins? It will support my custom themes? Or do I have to design them from scratch for 3.0? Many thanks for your help!

    Read the article

  • Best book / content for .NET 3.5

    - by Ram
    Hi, I want to study new .NET 3.5 concepts like WPF, WCF for work as well as for interviews. I am aware of .NET 2 but do not have any detailed knowledge of .NET 3.5 and newly added features in .NET 3.5 and C#. is there any good book/ online resource which would help me?

    Read the article

< Previous Page | 139 140 141 142 143 144 145 146 147 148 149 150  | Next Page >