Search Results

Search found 4989 results on 200 pages for 'svn merge'.

Page 133/200 | < Previous Page | 129 130 131 132 133 134 135 136 137 138 139 140  | Next Page >

  • Git already up to date unless I reset

    - by Chris
    I have a cloned repo I use for the live site and I have it pull from a bare repo. For some reason every time I execute "git pull" I get the already up to date message. But it's not up to date and not updated. If I do a git reset --hard HEAD^ and then git pull again, the changes come in. What's the problem here and how do I fix it so that git pull will pull and merge changes in without needing a hard reset?

    Read the article

  • How to use external makefile in Eclipse

    - by Morpheus
    Hi all! I have a source code of an OpenSource project which I get from SVN. I was able to run autogen -- configure -- and make successfully (through the terminal). But I want to build the same project with Eclipse, and I can't port manually those source files to eclipse though. So, How can I set Eclipse to use external make files ? can anyone please help me ? Thanks.

    Read the article

  • Is it possible to email the contents of vim using HTML

    - by brianegge
    I like to view the current differences in the source files I'm working on with a command like: vim <(svn diff -dub) What I'd really like to be able to do is to email that colorized diff. I know vim can export HTML with the :TOhtml, but how do I pipeline this output into an html email? Ideally. i'd like to be able to send an html diff with a single shell script command.

    Read the article

  • Iterating with CakePhp

    - by Michael
    Hi all, What do you all recommend for iterative development in cakePhp? Create a separate project and port it over once a week? Basically, what's the best way to keep a live site from a working site, and the best way to merge them automatically? Thanks!

    Read the article

  • How to make an eclipse plugin for text comparison of two files

    - by Snehal
    I plan to make a text comparison plugin for eclipse which basically provides a visual aid for changes that are required in the file and allows the user to accept or reject them. It is very much in lines of subclipse for svn or any other code comparison tools. I already found a good source to perform the text comparison but I'm looking for some pointers regarding the implementation of the UI in eclipse.

    Read the article

  • question about sorting

    - by skydoor
    Bubble sort is O(n) at best, O(n^2) at worst, and its memory usage is O(1) . Merge sort is always O(n log n), but its memory usage is O(n). Which algorithm we would use to implement a function that takes an array of integers and returns the max integer in the collection, assuming that the length of the array is less than 1000. What if the array length is greater than 1000?

    Read the article

  • Generic relations missing with grappelli

    - by diegueus9
    I'm using the last svn revision of grappelli and rev 11840 of django (before multidatabases and stuff), and i'm trying to use generic relations in the admin, but doesn't work, The model: class AutorProyectoLey(DatedModel): tipo_autor = models.ForeignKey(ContentType) autor_id = models.PositiveIntegerField() content_object = generic.GenericForeignKey('tipo_autor', 'autor_id') proyecto_ley = models.ForeignKey(ProyectoLey) The admin: class AutorInline(GenericInlineModelAdmin): model = AutorProyectoLey allow_add = True ct_field = 'tipo_autor' ct_fk_field = 'autor_id' classes = ('collapse-open',) And i put this model of var inlines in another adminmodel, but the html render is : <!-- Inlines --> <!-- Submit-Row -->

    Read the article

  • Asp.net hosting equivalent of Dreamhost (pricing, features and support)

    - by Cherian
    Disclaimer: I have browsed http://stackoverflow.com/questions/tagged/asp.net+hosting and didn’t find anything quite similar in value to Dreamhost. One of the biggest impediments IMHO for developing web applications on asp.net is the cost of deployment. I am not talking about building sites like Stackoverflow.com or plentyoffish.com. This is about sites that are bigger than brochureware and smaller than ones that require dedicated servers. Let me give you an example. xmec.org is an asp.net site I maintain for my college alumni. On an average it’s slated to hit around 1000-1100 views per day. At present it’s hosted on godaddy. The service is so damn pathetic; I am using it only because of the lack of options. The site doesn’t scale (no, it’s not the code) and the web control panels are extremely slow. The money I pay doesn’t justify the service or the performance. Every deployment push is a visit to the infuriating web control panel to set the permissions and the root directories. Had I developed it in python, this would have been deployed on Dreamhost.com with $10/year hosting fees (they have offers running all throughout) 50 GB space 5 MySQL Databases Shell / FTP Users POP / SMTP Access Unlimited Domains hosting Unlimited Sub domains hosting Unlimited Domains Forwarded/Mirrored Custom DNS (These are the only ones I could think of. More at the feature page) With a dream host shell, I even have a svn checked-out version of wordpress for my blog. Now, that’s control! To my question: Is there any asp.net (preferably .net 3.5. Dreamhost keeps on updating versions every fortnight) hosting company providing remotely similar feature-sets and pricing like Dreamhost. My requirements are: Less than $15-25/ year Typical WISP minus PHP .net 3.5 SP1 Full Trust mode(I can live with medium trust, if not for the IL emitting libraries) Isolated Application Pool 5 – 10 MySQL db’s Unlimited domain hosting MsSql 2005 or 2008 FTP support At Least 5 GB space SMTP IIS 7 Log files Accessibility Moderately good control panel Scripting, shell support Nominal bandwidth Another case in point: Recently I’ve been contemplating building a tool-website to find duplicates and weird characters in my Google contacts and fix them. With asp.net, the best part is that I can do this with LINQ to XML in less than 100 lines of code. What’s bad is the hosting part. I don’t think I stand to make any money out of this and therefore can’t afford to host it on GoGrid or DiscountAsp.net. Godaddy is not an option either. If I do this in python, I can push to this my existing $10 Dreamhost account with another domain pointed. No extra cost. Svn exported with scripts (capability) to change the connection string! Looking at the problem holistically, I think I represent a large breed of programmers playing it cheap and experimenting different things on a regular basis, one of which will become the next twitter/digg.

    Read the article

  • Automate TortoiseSVN commit using cruise control

    - by pratap
    hi all, i am new to tortoise svn, can any one tell how to automate tortoisesvn's commit process using cruisecontrol.net . My attempt to do that results in an exception... being thrown. My main concern is to auto close the window that pops up when we execute the command "tortoiseproc /command: commit /path:"**********PATH********* /logmsg: "log msg" /closeonend:1"

    Read the article

  • Override the Local module directory for cvs using Hudson

    - by Roberto
    Hi guys, I'm using Hudson and I need to change the checkout directory for cvs. Instead of checkout/update the project under the workspace dir, I'd like to specify a dir (as you can do for svn, changing the Local module directory conf) that will match the cvs tree structure. Eg. under cvs dir1/dir2/project on my box workspace/dir1/dir2/project is that possible with cvs and Hudson? Maybe there's a way to override the cvs call? Thanks! Roberto

    Read the article

  • Mergesort : Revision

    - by stan
    Does merge sort work by; taking a list of values splitting it in to two take the first element of each list, the lowest value one goes in to a new list(and i guess removed from the original). comare the next two numbers - do this until one list is empty, then place the rest of the other list at the end ofthe nw list? Also, what are the ramifications of doing this on a linked list? Thanks

    Read the article

  • Good tools for using Git on windows

    - by Ali Shafai
    I've been using SVN for my projects and had visualSVN for VS integration. however the Git work flow is different from traditional source control systems (Checkout/edit/stage/commit as oppose to Checkout/edit/commit). I was wondering if there is a good VS addon to support that. Also any good advice on using git on a windows dev machine is appreciated.

    Read the article

  • Pyjamas + Django: project without any external libraries

    - by gruszczy
    I would like to create small project using django and pyjamas. I tried googling for some solution on how to merge those two, but I found only projects using some external libraries using json services. Could anyone give me some advice on how to build such project so I wouldn't have to use them? I would like to use django auth system, but I don't know how to build it all without django templates and rendering.

    Read the article

  • Visual Studio Team Suite

    - by Kyle Rozendo
    Hi All, From a developer perspective, what would myself and my team gain from using Visual Studio Team System and Visual Studio Team Foundation Server? I can see some features and the like, but what have you gained from using the two versus using Visual Studio Professional and SVN. Thanks, Kyle (Apologies if there's a dupe, I can't find it though)

    Read the article

  • Merging two ASF files

    - by sijith
    I have an ASF file which contain 8 audios and 1 video. Now i want to merge this file with other of same ASF type. Is it possible to do with windows media SDK. My language is VC++ Please give some help

    Read the article

  • What is the best way to work on a MVC project online?

    - by Alon
    In a regular Web Forms application, I could upload the files to a web server and just open the web server in Visual Web Developer and it worked great, but because MVC is a project and not a web application, I can't just upload the files regulary and still open it in Visual Web Developre normally... So here comes the SVN, but the problem is that I can't show the web site before publish to my boss... Any solutions?

    Read the article

  • Referencing Entity from external data model - Core Data

    - by Ben Reeves
    I have a external library which includes a core data model, I would like to add a new entity to this model which has a relationship with one of the entities from the library. I know I could modify the original, but is there a way to without needing to pollute the library? I tried just creating a new model with an entity named the same, but that doesn't work: * Terminating app due to uncaught exception 'NSInvalidArgumentException', reason: 'Can't merge models with two different entities named 'Host''

    Read the article

  • Reloading of persisted entity

    - by Udi
    I'm using OpenJPA in my application as a JPA vendor. The question is theoretical or conceptual: Is there any way to tell an entity manager to load an entity from the DB rather than from it's cache? The problematic scenario: EM1.persist(Entity1) EM2.merge(Entity1) EM1.find(Entity1) <--- Entity1 is the cached version rather than the merged one.. Any elegant way to do it? I really don't want to call em.refresh(entity).

    Read the article

  • How do I pipe in FileMerge as a diff tool with git on OSX?

    - by doug
    I'm new to git, on OSX, using it via command line. I come from the world of Tortoise SVN and Beyond Compare on Windows. I want to be able to pipe in diffs to happen via FileMerge which I have installed already. I was able to do this with TextMate simply by using: git diff | mate But I'm not sure how to get that set up so I can use FileMerge instead?

    Read the article

  • Zend_Paginator - Increase querys

    - by poru
    Hello, I started using Zend_Paginator, it works everything fine but I noticed that there is one more query which slows the load time down. The additional query: SELECT COUNT(1) AS `zend_paginator_row_count` FROM `content` The normal query: SELECT `content`.`id`, `content`.`name` FROM `content` LIMIT 2 PHP: $adapter = new Zend_Paginator_Adapter_DbSelect($table->select()->from($table, array('id', 'name'))); $paginator = new Zend_Paginator($adapter); Could I merge the two querys into one (for better performance)?

    Read the article

  • Best format to submit an autocomplete?

    - by Keyo
    I'm seeking advice on best practice when submitting a varying amount of POST variables. Do I use JSON or some character separated list to merge all the values into one field or use a sequence of fields like 'autocomplete1', 'autocomplete2' and so on. Thanks in advance, Ben

    Read the article

< Previous Page | 129 130 131 132 133 134 135 136 137 138 139 140  | Next Page >