Search Results

Search found 5413 results on 217 pages for 'git pull'.

Page 161/217 | < Previous Page | 157 158 159 160 161 162 163 164 165 166 167 168  | Next Page >

• Why TortoiseHg not show the "merge conflict"?

  - by Jian Lin

  Short version of the question: Since I already have TortoiseHg, I right clicked on that file trying to see the merge conflict visually, but there is no way to see it? Details: To make a simple case of merge conflict, I hg init a repo on Win 7, and then clone it to another folder. Now, in one working directory, i added the line "the code is 123", committed. And in the other folder, i did an "hg pull" and "hg update" Now, I go back to the first folder, and change "123" to "123abc", and then do an "hg commit" And then I go to the other folder and edit "123" to "123xyz" over there, and do an "hg commit", and when "hg push", it says it can't. So I try to use any visual tool to see how the conflict is like, but ... TortoiseHg doesn't seem to have any option to do that?

  Read the article

• Correct structure and way of website versioning

  - by Saif Bechan

  Recently I use GIT to version my website. It makes it all really easy to see how my project develops and I always have save backups on different places on the web. Now my main question is if it is recommended to version your whole root of the website. I have a basic structure that looks something like this: /httpdocs /config /media /application index.php .htaccess 1) Should I use the /httpdocs folder to version, or should I use the content of the folder. 2) Is it recommended to version the media folder. In the media version I have several images for the overall layout, and some other images for the website. These imagas can be quite large. I work on these images from time to time and so they change. I hardly never need the old image again, so is this not just taking up precious storage space. I would highly appreciate just some basic recommendation on this topic.

  Read the article

• Make user object available to all Controllers in Zend?

  - by Sled

  Hey guys, I'm using Zend_Auth to identify a user in my application. This creates a session with the userobject. My question is how do I make this object available to every Controller and action, so I don't have to pull it out of the session every time I need data from this object? I'm guessing this should be done in bootstrap.php or index.php but I don't really know how to makte it available to every controller.. so any code examples would be appreciated! Thanks!

  Read the article

• A general declaration for all inherited classes

  - by Soham

  Consider, there is a class called SuperClass from which, ClassA, ClassB, ClassC is derived. From each one of those derived Classes, there are further more two classes are derived each called ChildClassAA and ChildClassAB[AB stands for Bth Child class from the Ath Class.Lets not really pull our hair on this nomenclature]. Now, ideally, I want to declare a general type as a private member of another Class say IndependentClass which can be initialized during run time as either of the objects of type ClassAor ClassB or ClassC and even the derived classes like ClassAA or ClassAB. Is there a possible way to do it?

  Read the article

• PHP regex to search across multiple lines

  - by Gaz

  I'm using preg_* in PHP to search for the pattern <!-- %{data=THIS GETS MATCHED}% --> and pull out the matched text. The pattern for this is: preg_match('#<!-- %{' . $knownString . '\s*=\s*(.*?)}% -->#', ...) What I would like it to do is search across multiple lines for the string. For example: <!-- %{data= THIS GETS MATCHED AND RETURNED }% --> How can I edit my current pattern to have this search ability?

  Read the article

• jQuery: how to handle empty return from getJSON

  - by Gee

  Alright so I have a php script which gets results from a DB, and to get those results I'm using a jQuery script to pull the results via getJSON. It works perfectly but now I want to do something if the php script returns no results (empty). I tried: $.getJSON('path/to/script'), {parameter:parameter}, function(data){ if (data) { alert('Result'); } else { alert('Empty); } }); But it's no good. I've tried different things like if (data.length) but still nothing. I've noticed that if there is no returned data the callback will never fire at all. So if that's the case, how do I handle a empty return?

  Read the article

• In MS Access is there a way to allow forms to update while maintaning Read Only

  - by Alex

  I have several forms linked tables via queries. The form pull data such as sales and ratios by selecting a product from the main's form's combo box. I am however having to issues: 1- I would ultimately prefer the combo box to be a free entry; however by just entering in the box and hitting enter (not a button called “enter on a screen” which would initiate recalcs, just normal enter), while it does bring the new information in sub-forms it also changes the information in the original table. If I make the table read only that it just doesn't allow the form to work by saying that the table is read only. 2- The same Read only issue occurs when another user with read only rights tries to use the database. I understand that ready only is functioning as intended, however I am wondering if there is way to make some functions work while disallowing the updating. I am unfortunately learning on the go, so go easy plz. Thank you

  Read the article

• code deployment options

  - by bobinabottle

  We've been looking at automating our server and code deployments. We've already decided on puppet for our server configurations, but are looking for a more "push" style tool to use for code deployments. I'm currently looking at either using capistrano or fabric, but I'm not sure what would be the most mature to use? We deploy a number of different services, none of which are currenlty written in rails or django, so we don't mind about language. What would be the best one to build custom deployment scripts? Or have I missed another tool out there? We are also considering git pushing with hooks for deployment, but feel it will be limited/hacky in what we want to achieve with it. Any thoughts or experience would be great to hear. Cheers

  Read the article

• Why is TargetInvocationException treated as uncaught by the IDE?

  - by Jason Coyne

  I have some code that is using reflection to pull property values from an object. In some cases the properties may throw exceptions, because they have null references etc. try { child.Target = propertyInfo.GetValue(target, null); } catch (TargetInvocationException ex) { child.Target = ex.InnerException.Message; } catch (Exception ex) { child.Target = ex.Message; } Ultimately the code works correctly, however when I am running under the debugger : When the property throws an exception, the IDE drops into the debugger as if the exception was uncaught. If I just hit run, the program flows through and the exception comes out as a TargetInvocationException with the real exception in the InnerException property. How can I stop this from happening?

  Read the article

• How can I receive messages using over http without MSMQ

  - by pduncan

  I need a reliable messaging framework that runs over http/https (due to client security requirements) and that doesn't use MSMQ (because some clients will use Windows XP Home). The clients only need to be able to receive messages, not send them. We already have a message queue on the server for each user, and the receivers have been getting messages by connecting to an HttpHandler on the server and getting a Stream from WebResponse.GetResponseStream() We keep this stream open, and pull messages off of it using Stream.Read(). This MOSTLY works, but Stream.Read() is a blocking call, and we can't reliably interrupt it. We need to be able to stop and start the receiver without losing messages, but the old stream often hangs around, even after we call Thread.Abort on its thread. Any suggestions?

  Read the article

• RMO on Windows 7 - The Specified module could not be found

  - by AGoodDisplayName

  My machine: Windows XP (x86), VS2008, .net 3.5, sql server 2005, WinForms - App works fine. Production Machines: Windows 7 (x64), SQl Server 2005 Express - App Starts but throws exception Visual Studio Targeting x86 on setup project and RMO project. Visual Studio gives me a a couple warnings but I can still build: Unable to find dependency 'MICROSOFT.SQLSERVER.MANAGEMENT.SQLPARSER' (Signature='89845DCD8080CC91' Version='10.0.0.0') of assembly 'Microsoft.SqlServer.Smo.dll' Unable to find dependency 'MICROSOFT.SQLSERVER.MANAGEMENT.SQLPARSER' (Signature='89845DCD8080CC91' Version='10.0.0.0') of assembly 'Microsoft.SqlServer.Management.SmoMetadataProvider.dll' This is a simple RMO (Replication Management Objects) app that initiates a pull subscription in SQL Server 2005 and displays status. Works fine on my machine, but fails on the production machine. I'm using a setup project to install the app on the production machine, but I think I'm missing a dependency somewhere, but I can't figure it out. On the production machine the app starts fine, but when I try to synch the subscription i get: System.IO.FileNotFoundException: The Specified module could not be found. (Exception from HResult: 0x8007007E)

  Read the article

• asp.net app slow and not rendering but .txt file works fine?

  - by mike

  i have a load balanced set of 2 servers running a .net application that is loading slow and not at all to the point the load balancer is redirecting me and my users to our dr server. i added a hard coded file to both servers to tell what server is working and not. both pull the txt file and display its contents in no time. however the asp.net pages dont render. the DB is not sweating and even a plain .aspx page doesnt come up. any thoughts on trouble shooting this?

  Read the article

• Noob here, but wanting to try and make my own app.

  - by Justin

  Hi all, I have a small amount of programing experience with Siemens and Allen Bradley but would like to make my own app for a certain website I frequent. I would like the website to be a little more user friendly for me instead of having to open browser etc. Is it possible to have a simple forum translated into a widget so you can see the forum posts and post from there? The website in question is http://vnboards.ign.com Any ideas or suggestions no matter how bad are appreciated. If it isnt worth attempting or my skills may not be up to par, feel free to say so :P Dont pull any punches :) Thanks! Justin

  Read the article

• Facebook,Android- How to get friends birthday from facebook

  - by Eriz

  I tried to goto lots of questions on this forum but could not find one useful so i decided to ask one myself. I want to pull the birthday's of all the friends in the users friend list. After going through a lot of stuff i found there are 2 ways to do that 1. Graph API 2. FQL Query So, my first question is , which one of them is better/easy to integrate in the app. Q2. http://developers.facebook.com/docs/tutorials/androidsdk/3.0/scrumptious/ is this tutorial useful for what i want to do. Q3. If i use Graph API/FQL Query , could you please give me a link which is helpful or a Code snippet Thanks In Advance, Eriz

  Read the article

• C++ String tokenisation from 3D .obj files

  - by Ben

  I'm pretty new to C++ and was looking for a good way to pull the data out of this line. A sample line that I might need to tokenise is f 11/65/11 16/70/16 17/69/17 I have a tokenisation method that splits strings into a vector as delimited by a string which may be useful static void Tokenise(const string& str, vector<string>& tokens, const string& delimiters = " ") The only way I can think of doing it is to tokenise with " " as a delimiter, remove the first item from the resulting vector, then tokenise each part by itself. Is there a good way to do this all in one?

  Read the article

• converting a form from text to textarea

  - by David Cook

  I have a form created to pull PHP values into my database. I created the form with all type="text" constructions. What follows is the code that used to set up the input of data and confirmed that it is functional. <label>About Me: <input type="text" name="BIO_info"/></label> I converted the input to a textarea and adjusted some parameters for proper display. Unfortunately, it has broken the ability for the script to function. What follows is the code I wrote to convert and store from a text area input. <label for="BIO_info" style=" margin-bottom: 500px; margin-top: 2000px; ">About Me: <textarea name="BIO_info" rows="20" cols="60" style="resize: none; overflow-y: hidden;vertical-align:middle;"></textarea> <p> I would appreciate any suggestions.

  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

• How many databases to support eCommerce?

  - by Terry Lorber

  I have a system with two databases, one that the customer-facing website uses, the second that is used by the "backroom" order-fulfillment system. I've been asked to run queries from the website to the backroom system. I'd rather not, it seems risky to allow web-based request to run unheeded on the internal system. Additionally, this means opening up routing in the firewall to allow external connections to the internal server. What's the best practice for eCommerce? Run the entire company off of one database? Or individual databases for each system, and middleware to connect them? Sometimes it might be necessary for the web application to pull date from the internal system, but not based on an HTTP request from the internet. I'm sure the best answer is "it depends!" So, if people have a rule of thumb for when to use middleware and when not to, I'd like to here it.

  Read the article

• Twitter Bootstrap Ajax call error in dialog2.js

  - by naveen kumar

  We are using Twitter Bootstrap for my application. I have situation where I have to pull the data from server and show it to popup/model div. We are using dialog2.js for it but it does work. We not want to use .load functionality as we are not using any single url call. We want it to do with “URL” by ajax call and response send back to popup/model content area. We have tried following $('#proposalInDialog2').click(function(event){ var url="abc.do" $('<div/>').dialog2({title: "Goals-Based Proposal", content: url}); }); Please help us to to find out this, thanks

  Read the article

• ASP.NET: How to assign ID to a field in DetailsView?

  - by jawonlee

  I have a master-detail page, in which I use GridView to display multiple rows of data, and DetailsView + jQuery dialog to display the details of a single records. only one DetailsView is open at a time. I need to be able to pull out a single field of the open DetailsView, for manipulation using JavaScript. Is there a way to give a unique ID to a given field in DetailsView, so I can use getElementByID? Or is there another way to accomplish what I'm trying to do? Thank you in advance.

  Read the article

• SQL - suppressing duplicate *adjacent* records

  - by Trevel

  I need to run a Select statement (DB2 SQL) that does not pull adjacent row duplicates based on a certain field. In specific, I am trying to find out when data changes, which is made difficult because it might change back to its original value. That is to say, I have a table that vaguely resembles: A, 5, Jan A, 12, Feb A, 12, Mar A, 12, Apr A, 9, May A, 9, Jun A, 5, Jul And I want to get the results: A, 5, Jan A, 12, Feb A, 9, May A, 5, Jul discarding adjacent duplicates but keeping the last row. The obvious: Select Letter, Number, Min(Month) from Table group by Letter, Number does not work -- it doesn't include the last row.

  Read the article

• SQL Time(2) to Array in C#?

  - by Jacob Huggart

  Hello all, I am using ASP MVC and SQL Server and I have a database that is updated intermittently with expected wait times for some event. Also, I am using some ajax and jquery. I need to display the average and maximum wait times. How can I take the entire list of time from the server and get the average time? Also, what would be the best method to simply grab a new time from the server when it is updated without having to pull the whole list again? Thanks!

  Read the article

• How to extract a single function from a source file

  - by Adam Matan

  Hi, I'm working on a small academic research about extremely long and complicated functions in the Linux kernel. I'm trying to figure out if there is a good reason to write 600 or 800 lines-long functions. For that purpose, I would like to find a tool that can extract a function from a .c file, so I can run some automated tests on the function. For example, If I have the function cifs_parse_mount_options() within the file connect.c, I'm seeking a solution that would roughly work like: extract /fs/cifs/connect.c cifs_parse_mount_options and return the 523 lines of code(!) of the function, from the opening braces to the closing braces. Of course, any way of manipulating existing software packages like gcc to do that, would be most helpful too. Thanks, Udi EDIT : The answers to Regex to pull out C function prototype declarations? convinced me that matching function declaration by regex is far from trivial.

  Read the article

• Rails: How do I run a before_save only if certain conditions are met?

  - by Shpigford

  I have a before_save method that I call that renames an uploaded image. before_save :randomize_file_name def randomize_file_name extension = File.extname(screen_file_name).downcase key = ActiveSupport::SecureRandom.hex(8) self.screen.instance_write(:file_name, "#{key}#{extension}") end That method is part of my Item model. That works great when I create a new item or need to update the image associated with an item...but the problem is that if I need to update an item but NOT the image, the randomize_file_name method still gets run and renames the file in the database (though not the file itself, obviously). So, I'm thinking I need to figure out a way to only run randomize_file_name if a file is included in the form submission...but I'm not sure how to pull that off.

  Read the article

• extract doc file from WYSIWYG

  - by Fawaz Qamar

  Hi guys, Last week while i was working on WYSIWYG - cKeditor. a question came in my mind. Is there any way to extract or pull out the content of doc or docx file into the blogger or wordpress text area. For instance, we need not to select and copy the text or images from doc(x) file. All we need to do is hand over the file to WYSIWYG and content of doc(x) file is pasted in the post. Any suggestion would be appreciated. Thanks Fawaz

  Read the article

< Previous Page | 157 158 159 160 161 162 163 164 165 166 167 168  | Next Page >