Search Results

Search found 4819 results on 193 pages for 'git merge'.

Page 135/193 | < Previous Page | 131 132 133 134 135 136 137 138 139 140 141 142  | Next Page >

• How do you fix an SVN 409 Conflict Error

  - by NerdStarGamer

  I used to use SVN 1.4 on OS X Leopard and everything was fine. A couple of weeks ago I installed a fresh copy of OS X 10.6. The version of SVN that comes with Snow Leopard is 1.6.5. I went ahead and built my own copy with 1.6.6. I'm using the built in apache server and just hosting repositories locally. Everything appeared to work fine until I actually tried to commit something. Everytime I try to commit a change, I get the following message: Transmitting file data .svn: Commit failed (details follow): svn: MERGE of '/svn/svn2': 409 Conflict (http://localhost) This happens with my old repositories, so I created a couple of new ones. Same deal. I also tried using the 1.6.5 version that comes with the system...same. Finally, I tried upgrading to the latest stable SVN (1.6.9) and still got the same problem. The Apache error logs the following for each failed commit: [Mon Mar 29 19:53:10 2010] [error] [client ::1] Could not MERGE resource "/svn/svn2/!svn/act/d399326f-c20f-424f-bb68-3bb40503b5b1" into "/svn/svn2". [409, #0] [Mon Mar 29 19:53:10 2010] [error] [client ::1] An error occurred while committing the transaction. [409, #2] [Mon Mar 29 19:53:10 2010] [error] [client ::1] Can't open directory '/usr/local/svn/svn2/db/transactions/5-6.txn/\xeb\xa9\x0f\x1f': No such file or directory [409, #2] [Mon Mar 29 19:53:11 2010] [error] [client ::1] Could not DELETE /svn/svn2/!svn/act/d399326f-c20f-424f-bb68-3bb40503b5b1. [500, #0] [Mon Mar 29 19:53:11 2010] [error] [client ::1] could not open transaction. [500, #2] [Mon Mar 29 19:53:11 2010] [error] [client ::1] Can't open file '/usr/local/svn/svn2/db/transactions/5-6.txn/props': No such file or directory [500, #2] And from the access log: ::1 - - [30/Mar/2010:13:02:20 -0400] "OPTIONS /svn/svn2 HTTP/1.1" 401 401 ::1 - user [30/Mar/2010:13:02:20 -0400] "OPTIONS /svn/svn2 HTTP/1.1" 200 188 ::1 - user [30/Mar/2010:13:02:20 -0400] "PROPFIND /svn/svn2 HTTP/1.1" 207 647 ::1 - user [30/Mar/2010:13:02:20 -0400] "PROPFIND /svn/svn2 HTTP/1.1" 207 647 ::1 - user [30/Mar/2010:13:02:20 -0400] "PROPFIND /svn/svn2/!svn/vcc/default HTTP/1.1" 207 398 ::1 - user [30/Mar/2010:13:02:20 -0400] "PROPFIND /svn/svn2/!svn/bln/6 HTTP/1.1" 207 449 ::1 - user [30/Mar/2010:13:02:20 -0400] "REPORT /svn/svn2/!svn/vcc/default HTTP/1.1" 200 1172 Curiously, the commit does actually commit the changes, but the working copy doesn't see that and everything gets screwy. I've tried to Google every variation I can think of for this problem, but the search results are pretty much useless. I'm not using TortoiseSVN or anything special and commits fail on a new repository, so I know it's not a problem with my old repos. Any help would be greatly appreciated.

  Read the article

• NameError at / uninitialized constant Sass::SyntaxError

  - by Ivo Sabev

  I am using Padrino and when I try to specify my application.sass file I get this error NameError at / uninitialized constant Sass::SyntaxError I thought I might have something missing, so I checked out the sample_blog application at their GIT to verify my SASS is working correct. It was working correct and the blog app was running fine. Then I decided to change a line in the blog's application.sass and I got this error. I am using TextMate to edit the file. Weird indeed, any advices?

  Read the article

• Capistrano, Mercurial and branches

  - by J. Pablo Fernández

  It is my understanding that although Mercurial has support from branches, the community generally clone repos instead of creating branches. Similar to the Darcs model, unlike the Git model. I'm deploying a Ruby on Rails app with Capistrano and there I'd like to separate the production from the development branch. Should I point Capistrano to a different repo or should I use branches?

  Read the article

• JasperReports multi-page report with different content

  - by Han Fastolfe

  I'm evaluating JasperReport and iReport, a requirement is the possibility to produce a multiple page report in which every page contains a different report. Example: Page 1 contains an actual invoice for a customer Page 2 contains the invoices list for the customer Page 3 contains a graph of amount of invoices by year Page 4 contains only fixed text (say operator instructions ...) Is it possible to create such a unique report instead of creating four standalone report and then merge the pdfs. Thank a lot. Francesco

  Read the article

• Mercurial Queues: combining patches

  - by Eamon Nerbonne

  I've been playing with Mercurial and mercurial queues, and now have a fairly reasonable working version. However, before I submit a patch, I'd like to take that spagetti-history and merge it into discrete, logical steps, rather than the semi-overlapping repeated do-undo-redo-slightly-differently mess it is now, if only to reduce the number of patches. How do I do that?

  Read the article

• DocBook sources of "Starting with Lift"

  - by Wilfred Springer

  By the looks of it, I wouldn't be surprised if "Starting with Lift" has been created from DocBook. I looked in Lift's Git repositories, but I haven't been able to find the source DocBook documents. So, is it really based on DocBook? And if it is, is it available from some public repository?

  Read the article

• File differencing software on Windows?

  - by larryq

  Just wondering what's out there that everyone likes. I have to merge some changes among several developers (C#) and wanted to see what kind of alternatives to windiff are around.

  Read the article

• Capistrano + SVN, Merging Branches/Tags and Deploying

  - by Jon Busby

  We are finding that merging using tortise SVN is slow and cumbersome, we've also recently started using capistrano (capify) to deploy to development. Is there a way to merge revisions to a branch and automatically deploy to another environment if needed? Thanks

  Read the article

• Most efficient algorithm for merging sorted IEnumerable<T>

  - by franck

  Hello, I have several huge sorted enumerable sequences that I want to merge. Theses lists are manipulated as IEnumerable but are already sorted. Since input lists are sorted, it should be possible to merge them in one trip, without re-sorting anything. I would like to keep the defered execution behavior. I tried to write a naive algorithm which do that (see below). However, it looks pretty ugly and I'm sure it can be optimized. It may exist a more academical algorithm... IEnumerable<T> MergeOrderedLists<T, TOrder>(IEnumerable<IEnumerable<T>> orderedlists, Func<T, TOrder> orderBy) { var enumerators = orderedlists.ToDictionary(l => l.GetEnumerator(), l => default(T)); IEnumerator<T> tag = null; var firstRun = true; while (true) { var toRemove = new List<IEnumerator<T>>(); var toAdd = new List<KeyValuePair<IEnumerator<T>, T>>(); foreach (var pair in enumerators.Where(pair => firstRun || tag == pair.Key)) { if (pair.Key.MoveNext()) toAdd.Add(pair); else toRemove.Add(pair.Key); } foreach (var enumerator in toRemove) enumerators.Remove(enumerator); foreach (var pair in toAdd) enumerators[pair.Key] = pair.Key.Current; if (enumerators.Count == 0) yield break; var min = enumerators.OrderBy(t => orderBy(t.Value)).FirstOrDefault(); tag = min.Key; yield return min.Value; firstRun = false; } } The method can be used like that: // Person lists are already sorted by age MergeOrderedLists(orderedList, p => p.Age); assuming the following Person class exists somewhere: public class Person { public int Age { get; set; } } Duplicates should be conserved, we don't care about their order in the new sequence. Do you see any obvious optimization I could use?

  Read the article

• Linux/OpenSSL:Send find output to openssl

  - by Starsky

  I am trying to send the output from the find command to OpenSSL in order to find out when certificates expire. This finds the files find . -name \*.pem -type f This generates the cert info I want openssl x509 -in certname.pem -noout -enddate Can I merge these two? Thanks for your help.

  Read the article

• MS Access group development

  - by Hubidubi

  We are planning to redesign quite a huge MS Access application. Is there any way to work concurently on the same application or is it possible to merge two seperate instance of the same file (not the data, but the forms and code). Now Access contains the data, but in the future version MySQL will host the data and Access will be only the frontend (via ODBC)

  Read the article

• Performance using T-SQL PIVOT vs SSIS PIVOT Transformation Component.

  - by Nev_Rahd

  Hi I am in process of building Dimension from EDW (source), wherein I need to pivot columns of source to load Dimension. Currently most of the pivoting stuff am doing is by using T-SQL PIVOT which further get used in my SSIS package to merge with Dim table This pivoting can also be achieved by SSIS PIVOT Transformation component. In regards to Performance which approach would be the best? Thanks

  Read the article

• Authlogic openid: getting undefined method openid_identifier? error in functional test

  - by usr

  I use Authlogic with the Authlogic-openid addon (I gem installed ruby- openid and script/plugin install git://github.com/rails/open_id_authentication.git) and get two errors. First when running functional test, I get an undefined method openid_identifier? message on a line in my new.html.erb file when running the UsersControllerTest. The line is: <% if @user.openid_identifier? %> When running script/console I can access this method without any problem. Second when testing the openid functionality and registering a new user to my application using openid and using my blogspot account for that I get the following in my log file: Generated checkid_setup request to http://www.blogger.com/openid-server.g with assocication ... Redirected to http://www.blogger.com/openid-server.g?openid.assoc_handle=... NoMethodError (You have a nil object when you didn't expect it! The error occurred while evaluating nil.call): app/controllers/users_controller.rb:44:in `create' /usr/lib/ruby/1.8/webrick/httpserver.rb:104:in `service' /usr/lib/ruby/1.8/webrick/httpserver.rb:65:in `run' /usr/lib/ruby/1.8/webrick/server.rb:173:in `start_thread' /usr/lib/ruby/1.8/webrick/server.rb:162:in `start' /usr/lib/ruby/1.8/webrick/server.rb:162:in `start_thread' /usr/lib/ruby/1.8/webrick/server.rb:95:in `start' /usr/lib/ruby/1.8/webrick/server.rb:92:in `each' /usr/lib/ruby/1.8/webrick/server.rb:92:in `start' /usr/lib/ruby/1.8/webrick/server.rb:23:in `start' /usr/lib/ruby/1.8/webrick/server.rb:82:in `start' The code in the users_controller is straight forward: def create respond_to do |format| @user.save do |result| if result flash[:notice] = t('Thanks for signing up!') format.html { redirect_to :action => 'index' } format.xml { render :xml => @user, :status => :created, :location => @user } else format.html { render :action => "new" } format.xml { render :xml => @user.errors, :status => :unprocessable_entity } end end end end The line giving the error being @user.save do |result|... I feel I'm missing something pretty basic but I have been staring at this for too long because I can't find what it is. I checked with the code on Railscasts episodes 160 and 170 and the bones GitHub project but found nothing. Thanks for your help, usr

  Read the article

• java and rtf editing

  - by Dainius

  Hi, I have rtf file in with I need replace some field values (with word I can do it with mail merge, but I need do this with java). I found iText (2.1.7) source code with can parse rtf files, but I can find hove to manipulate the content of file. Or maybe there is some better solution for editing rtf?

  Read the article

• Erlang "must-have" development tools

  - by Jonas

  I am not a professional Erlang developer (not yet), but I would like to hear what Erlang development tools are "must-have" in the industry (besides emacs and git/mercurial) ? I do know about a few tools like: rebar, dialyzer, hipe, eunit and edoc but I have no idea if they are used by professional erlang developers or if there are other tools that are "must-have". This question is inspired by Java "must-have" development tools

  Read the article

• Offline product catalog

  - by Ben

  I am looking for a way to automate the production of an offline product catalog using product data contained in an SQL Server database. I have thought about using both Crystal Reports and SQL Server Reporting Services for this but there may be something better suited for the job. There is a requirement to display product images also (currently stored in the database). I thought about perhaps doing a simple Word Mail Merge for this but am not sure how I will handle images. Suggestions appreciated Thanks Ben

  Read the article

• Undefined symbols for architecture armv7 using route-me

  - by Alex

  I'm trying to compile my project including route-me using armv7 although am struggling with the following error, i have older versions of the same project in git which compiles fine with armv7 so a setting must have changed somewhere to break it, here is the error: Undefined symbols for architecture armv7: "_pj_fwd", referenced from: -[RMProjection latLongToPoint:] in libMapView.a(RMProjection.o) "_pj_inv", referenced from: -[RMProjection pointToLatLong:] in libMapView.a(RMProjection.o) "_pj_init_plus", referenced from: -[RMProjection initWithString:InBounds:] in libMapView.a(RMProjection.o) "_pj_free", referenced from: -[RMProjection dealloc] in libMapView.a(RMProjection.o) ld: symbol(s) not found for architecture armv7 clang: error: linker command failed with exit code 1 (use -v to see invocation) Any help would be greatly appreciated.

  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

• ReSharper Code Cleanup/Reformat Code feature vs Versioning Control Systems

  - by Romain Verdier

  ReSharper Code cleanup feature (with "reorder members" and "reformat code" enabled) is really great. You define a layout template using XML, then a simple key combination reorganizes your whole source file (or folder/project/solution) according to the rules you set in the template. Anyway, do you think that could be a problem regarding VCS like subversion, cvs, git, etc. ? Is there a chance that it causes many undesired conflicts ? Thank you.

  Read the article

• Good Secure Backups Developers at Home

  - by slashmais

  What is a good, secure, method to do backups, for programmers who do research & development at home and cannot afford to lose any work? Conditions: The backups must ALWAYS be within reasonably easy reach. Internet connection cannot be guaranteed to be always available. The solution must be either FREE or priced within reason, and subject to 2 above. Status Report This is for now only considering free options. The following open-source projects are suggested in the answers (here & elsewhere): BackupPC is a high-performance, enterprise-grade system for backing up Linux, WinXX and MacOSX PCs and laptops to a server's disk. Storebackup is a backup utility that stores files on other disks. mybackware: These scripts were developed to create SQL dump files for basic disaster recovery of small MySQL installations. Bacula is [...] to manage backup, recovery, and verification of computer data across a network of computers of different kinds. In technical terms, it is a network based backup program. AutoDL 2 and Sec-Bk: AutoDL 2 is a scalable transport independant automated file transfer system. It is suitable for uploading files from a staging server to every server on a production server farm [...] Sec-Bk is a set of simple utilities to securely back up files to a remote location, even a public storage location. rsnapshot is a filesystem snapshot utility for making backups of local and remote systems. rbme: Using rsync for backups [...] you get perpetual incremental backups that appear as full backups (for each day) and thus allow easy restore or further copying to tape etc. Duplicity backs directories by producing encrypted tar-format volumes and uploading them to a remote or local file server. [...] uses librsync, [for] incremental archives Other Possibilities: Using a Distributed Version Control System (DVCS) such as Git(/Easy Git), Bazaar, Mercurial answers the need to have the backup available locally. Use free online storage space as a remote backup, e.g.: compress your work/backup directory and mail it to your gmail account. Strategies See crazyscot's answer

  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

• Are there sites hosting fossil repositories?

  - by Alex_coder

  There are many sites that host public repositories of code. Examples launchpad (bazaar) bitbucket (mercurial) github (git) Are there similar sites that allow coders to store and manage fossil repositories for free?

  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

• How to store wiki sites (vcs)

  - by Eugen

  Hello, as a personal project I am trying to write a wiki with the help of django. I'm a beginner when it comes to web development. I am at the (early) point where I need to decide how to store the wiki sites. I have three approaches in mind and would like to know your suggestion. Flat files I considered a flat file approach with a version control system like git or mercurial. Firstly, I would have some example wikis to look at like http://hatta.sheep.art.pl/. Secondly, the vcs would probably deal with editing conflicts and keeping the edit history, so I would not have to reinvent the wheel. And thirdly, I could probably easily clone the wiki repository, so I (or for that matter others) can have an offline copy of the wiki. On the other hand, as far as I know, I can not use django models with flat files. Then, if I wanted to add fields to a wiki site, like a category, I would need to somehow keep a reference to that flat file in order to associate the fields in the database with the flat file. Besides, I don't know if it is a good idea to have all the wiki sites in one repository. I imagine it is more natural to have kind of like a repository per wiki site resp. file. Last but not least, I'm not sure, but I think using flat files would limit my deploying capabilities because web hosts maybe don't allow creating files (I'm thinking, for example, of Google App Engine) Storing in a database By storing the wiki sites in the database I can utilize django models and associate arbitrary fields with the wiki site. I probably would also have an easier life deploying the wiki. But I would not get vcs features like history and conflict resolving per se. I searched for django-extensions to help me and I found django-reversion. However, I do not fully understand if it fit my needs. Does it track model changes like for example if I change the django model file, or does it track the content of the models (which would fit my need). Plus, I do not see if django reversion would help me with edit conflicts. Storing a vcs repository in a database field This would be my ideal solution. It would combine the advantages of both previous approaches without the disadvantages. That is; I would have vcs features but I would save the wiki sites in a database. The problem is: I have no idea how feasible that is. I just imagine saving a wiki site/source together with a git/mercurial repository in a database field. Yet, I somehow doubt database fields work like that. So, I'm open for any other approaches but this is what I came up with. Also, if you're interested, you can find the crappy early test I'm working on here http://github.com/eugenkiss/instantwiki-test

  Read the article

• What's you favorite algorithm?

  - by Helper Method

  Which algorithm do you like best and why? My favorite algorithm is Insertion Sort. Easy to understand, fast for small arrays, and useful to speed up more complex sorting algorithms (Merge Sort, Quicksort).

  Read the article

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