Search Results

Search found 2823 results on 113 pages for 'perforce branch spec'.

Page 43/113 | < Previous Page | 39 40 41 42 43 44 45 46 47 48 49 50  | Next Page >

• Can I undo the last git push?

  - by Stray

  A team member accidentally pushed half a gig of unwanted zips to the remote repo last night when they were in a rush. Yes... oops. Nobody has pulled or committed since. Ideally I want to just 'undo' what happened. I have looked at filter-branch and was thinking of trying something like git filter-branch --tree-filter 'rm -f *.zip' HEAD but that would be local, and I can't figure out how to do it direct on the remote repo. Is there a simpler way to undo what happened? If she amends her last commit and pushes again will that undo the push - ie actually remove those files from the history? Obviously if she deletes them, commits and pushes again then that still leaves the content in the repo, which is no good.

  Read the article

• Codeigniter: Retrieving data from multiple tables and displaying results

  - by Craig Ward

  Hi, I am developing my first big application using codeigniter and need a little help as I am fairly new to it all. I know how to get records out of the DB and display them, but I now have to get results from two tables and display them. I pass $data to the view, it works fine for $data['prop'] but I can't get the rest. $data['prop'] = $this->ManageProperty_model->get_property_details($p_id); $data['img'] = $this->ManageProperty_model->get_property_images($p_id); $this->load->model('ManageBranch_model'); $data['branch'] = $this->ManageBranch_model->get_branch_details($p_id); I usually echo out results like so: <?php foreach ($prop as $p) : ?> <?php echo $p->ID; ?> <?php endforeach; ?> Even if there is only 1 row being returned as I am not sure of another way.do I need a foreach for img and branch?

  Read the article

• What are the uses of svn copy?

  - by nav.jdwdw

  Example: $ svn copy foo.txt bar.txt A bar.txt When would you use this technique, and why? Will this command (taken from svn's "red book") creates a copy of <foo.txt> while preserving the history of it to be shared with <bar.txt>? If I'm changing <bar.txt>, what will happen to <foo.txt>? What are the equivalents to this in other modern systems (Clearcase, Accurev, Perforce)? Clarification: Let me emphasize the point I'm searching for: Is this kind of branching out on a file level? What happens if you use it in the same branch, i.e. create a copy of a file and than start changing that new file. all in the same branch? I understand that it is also used for tagging but what is interesting me is what to expect when performing <svn copy> On the file level

  Read the article

• Java3d shape with Antlr

  - by Eldeus

  Well how to evaluate a very simple antlr grammar that does only this. Box(1,2,4) Cylinder(1,2) and builds java3d shapes, (given I have already built a canvas for java3d and have the code for creating each element in java, protected static BranchGroup addBox1(Float a, Float b, Float C){ // create branch for display TransformGroup bodyTransform = new TransformGroup(); BranchGroup bg = new BranchGroup(); bg.setCapability(BranchGroup.ALLOW_DETACH); bg.setUserData(shapeId); // set transformation bodyTransform = setTransformShape(0,0,0,0,0,0,0); // create box Box tmpBox = new Box(a,b,c, Primitive.GENERATE_NORMALS | Primitive.GENERATE_TEXTURE_COORDS,setAppearance(color)); getCoords(tmpBox); bodyTransform.addChild(tmpBox); trFormList.add(bodyTransform); shapeId++; //add box to branch bg.addChild(bodyTransform); return bg; } ) thanks

  Read the article

• Is nothing truly ever deleted in git?

  - by allenskd

  I'm currently learning git, usually I'm a bit skeptic of VCS since I have a hard time getting used to them. I deleted a branch called "experimental" with some tmp files, I saw the files removed in my working directory so I scratched my head and wondered if this is normal, can I bring it back in case I need it again, etc. I found the SHA making the commit of the tmp files and recreated the branch with the provided sha and saw it again with all the files and their current content. Everything I do in the working directory can be reverted once I commit it? Might seem like a silly question to many people, but it kinda intrigues me so I want to know the limits

  Read the article

• environment configuration for tests running in NUnit

  - by Frank Schwieterman

  I have some integration tests that hit a webserver and verify certain functionalities. Depending on the build environment, the server will be at a different address (http://localhost:8080/, http://test-vm/, etc). I would like to run these tests from a TFS build. I'm wondering whats the appropriate way to configure these tests? Would I just add a setting to the config file? I'm doing that currently. Incidentally we do have a separate branch per test environment, so I could have a different config file checked in for each environment. I wonder if there is a better way though? I'd like the build project to be able to tell the test what server to test. This seems better because then I don't have to maintain config information on a per branch basis. I believe I'd be using NUnit for Team Build (http://nunit4teambuild.codeplex.com/) to get NUnit/TFS to play together.

  Read the article

• SVN is not recognizing the changed files

  - by Tom Brito

  I had made changes in a folder called "branch", and now that its working I want to move all the src folder to the folder "trunk". But by copying src from local branch, pasting on local trunk and commiting the SVN commits nothing. Its like nothing had changed. Any idea how to commit this? Related question: http://stackoverflow.com/questions/206183/how-can-i-force-subversion-to-commit-an-unchanged-file (Would work for me, but I know nothing about properties, exactly which one could I change and with which value to not crash something?)

  Read the article

• Incorrect emacs indentation in a C++ class with DLL export specification

  - by Michael Daum

  I often write classes with a DLL export/import specification, but this seems to confuse emacs' syntax parser. I end up with something like: class myDllSpec Foo { public: Foo( void ); }; Notice that the "public:" access spec is indented incorrectly, as well as everything that follows it. When I ask emacs to describe the syntax at the beginning of the line containing public, I get a return of: ((label 352)) If I remove the myDllSpec, the indentation is correct, and emacs tells me that the syntax there is: ((inclass 352) (access-label 352)) Which seems correct and reasonable. So I conclude that the syntax parser is not able to handle the DLL export spec, and that this is what's causing my indentation trouble. Unfortunately, I don't know how to teach the parser about my labels. Seems that this is pretty common practice, so I'm hoping there's a way around it.

  Read the article

• How to merge on project / multiple files in VSS?

  - by Vijay

  I have VSS 6.0. I have branched my project so that I can do parallel development. I have 100s of files in folder/subfolders. I have changed some 10-20 files in multiple folders in ver 2 branch. Now I want to merge changes done in ver 2 to ver 1 branch. When I select the project merge branches option is not enabled. neither is it enabled when I select multiple files inside a folder. It's only enabled when one file is selected. Can I not merge on folder / multiple files in VSS 6.0. My thinking was when I do merge on project, VSS would pop up file names whenever there's a conflict (i.e files that are changed)

  Read the article

• git and local modifications

  - by user362073

  Hi I am discovering how to use git. I just made the following test: create a folder and 2 files then git init, git add ., git commit -m "initial commit" create a branch: git branch experimental, git checkout experimental then change the name of the folder and delete one of the files, then git add ., git commit -m "experimental" go back to master: git checkout master Surprise: I do not find the master as I left it; the folder has disappeared. And I have to do a git -reset --hard to find my folder. I wonder if I did something wrong or if I have not understood how git manages local changes. Thanks for your help.

  Read the article

• Could I use Revert after abrupting Merge?

  - by John

  Hallo all, Just now I tried to upload a modified working copy to its branch in the following steps: 1. Update 2. Commit Then I attempted to Merge the changes in the trunk to this branch. However during editing of the conflicts I realized there were so many conflicting codes that I could not address completely today, then I gived up the Merge, and the working copy got an exclamation mark immediately. Thru Check for modifications I found that many many files had been modified or had conflicts. It seems that the Merge has been somehow wrongly carried out. My question: could I return to the state before the Merge simply using Revert? Thanks a lot in advance, John

  Read the article

• Is there a way to undo Mocha stubbing of any_instance?

  - by Steve Weet

  Within my controller specs I am stubbing out valid? for some routing tests, (based on Ryan Bates nifty_scaffold) as follows :- it "create action should render new template when model is invalid" do Company.any_instance.stubs(:valid?).returns(false) post :create response.should render_template(:new) end This is fine when I test the controllers in isolation. I also have the following in my model spec it "is valid with valid attributes" do @company.should be_valid end Again this works fine when tested in isolation. The problem comes if I run spec for both models and controllers. The model test always fails as the valid? method has been stubbed out. Is there a way for me to remove the stubbing of any_instance when the controller test is torn down. I have got around the problem by running the tests in reverse alphabetic sequence to ensure the model tests run before the controllers but I really don't like my tests being sequence dependant.

  Read the article

• Why am I getting the error "undefined local variable or method `assigns'"?

  - by Jason

  I might be missing something basic here, but I'm stumped on this error: model code: class CachedStat < ActiveRecord::Base def self.create_stats_days_ago(days_ago, human_id) d = Date.today - days_ago.day @prs = PageRequest.find(:all, :conditions => [ "owner_type = 'Human' and owner_id = ? and created_at = ?", human_id, d] ) end end spec code: it "should create stats for the specified number of days in the past" do CachedStat.create_stats_days_ago(1, Human.first.id) assigns[:prs].should eql("foo") end The error is: undefined local variable or method `assigns' for #<Spec::Rails::Example::ModelExampleGroup::Subclass_1:0x2fbac28> I feel like I'm overlooking something obvious but it's invisible to me. Any suggestions? Thanks very much! -Jason

  Read the article

• Writing OLAP SQL query

  - by user1859596

  I have a project I am working on that requires the following : create a normalized sample rdbms (5 tables) using Java I entered 1 million rows of data to each table run two OLTP and two OLAP queries on the normalized tables. Denormalized tables. run the same OLTP and OLAP queries on them and compare time. What does OLAP query mean? I've searched the internet and all that I can find is that I have to make a cube, and apply queries on it. How can I write an OLAP query on a RDBMS? I have a sample : tables normalized(orders,product,customer,branch,sales) sales : order_id,product_id,quantity product : product_id,name,description,price,sales_tax customer : customer_id,f_name,l_name,tel_no,addr,nic,city branch : branch_id,name,tel_no,addr,city orders : order_id,customer_id,order_date,branch_id I want to write an OLAP query on the above tables. I am using Oracle Express with SQL Developer.

  Read the article

• Agile version control?

  - by Paul Dixon

  I'm trying to work out a good method to manage code changes on a large project with multiple teams. We use subversion at the moment, but I want more flexibility in building a new release than I seem to be able to get with subversion. Here's roughly I want: for each developer to create easily identifiable patches for the project. Each patch delivers a complete user story (a releasable feature or fix). It might encompass many changes to many files. developers are able to easily apply and remove their own and other patches to facilitate testing release manager selects the patches to be used in the next release into a new branch branch is tested, fixes merged in, and ultimately merged into live teams can then pull these changes back down into their sandboxes. I'm looking at stacked git as a way of achieving this, but what other tools or techniques can deliver this sort of workflow?

  Read the article

• What is the best way to mock a 3rd party object in ruby?

  - by spinlock

  I'm writing a test app using the twitter gem and I'd like to write an integration test but I can't figure out how to mock the objects in the Twitter namespace. Here's the function that I want to test: def build_twitter(omniauth) Twitter.configure do |config| config.consumer_key = TWITTER_KEY config.consumer_secret = TWITTER_SECRET config.oauth_token = omniauth['credentials']['token'] config.oauth_token_secret = omniauth['credentials']['secret'] end client = Twitter::Client.new user = client.current_user self.name = user.name end and here's the rspec test that I'm trying to write: feature 'testing oauth' do before(:each) do @twitter = double("Twitter") @twitter.stub!(:configure).and_return true @client = double("Twitter::Client") @client.stub!(:current_user).and_return(@user) @user = double("Twitter::User") @user.stub!(:name).and_return("Tester") end scenario 'twitter' do visit root_path login_with_oauth page.should have_content("Pages#home") end end But, I'm getting this error: 1) testing oauth twitter Failure/Error: login_with_oauth Twitter::Error::Unauthorized: GET https://api.twitter.com/1/account/verify_credentials.json: 401: Invalid / expired Token # ./app/models/user.rb:40:in `build_twitter' # ./app/models/user.rb:16:in `build_authentication' # ./app/controllers/authentications_controller.rb:47:in `create' # ./spec/support/integration_spec_helper.rb:3:in `login_with_oauth' # ./spec/integration/twit_test.rb:16:in `block (2 levels) in <top (required)>' The mocks above are using rspec but I'm open to trying mocha too. Any help would be greatly appreciated.

  Read the article

• e-commerce product data/metadata schemas

  - by Shreko

  Trying to figure out how is product data/metadata schema designed. For example, how does an e-commerce site enter a product spec. Does it copy and paste from mfg spec sheet, enters it in their own fields or something else? Here is an example, looking at the D3000 Nikon DSLR Manufacturer: http://nikon.ca/en/Product.aspx?m=17300&disp=Specs futureshop.ca: www.futureshop.ca/en-CA/product/nikon-nikon-d3000-10-2mp-dslr-camera-with-18-55mm-lens-kit-d3000/10128435.aspx?path=865c2348a1542e848982c9dbd9253483en02 memoryexpress.com: www.memoryexpress.com/Products/PID-MX25539%28ME%29.aspx They are all slightly different in order or in parent/child field? What's storage is used for this type of info rdbms or xml?

  Read the article

• git divergent renaming

  - by pablo

  Hi, I'd like to know how you handle a situation like this in Git: create branch task001 from master master: modify foo.c and rename it to bar.c task001: modify foo.c and rename it to moo.c merge task001 to master What Git tells me is: CONFLICT (rename/rename): Rename "foo.c"->"bar.c" in branch "HEAD" rename "foo.cs"->"moo.c" in "task001" Automatic merge failed; fix conflicts and then commit the result. How should I solve it? I mean, I still want to merge the two files once the name conflict is resolved. Thanks.

  Read the article

• SVN merge adding parameters. WTF? Or how to do big merges?

  - by HeavyWave

  I am doing an SVN merge for a branch, and in one of the files I see this: GetQueryReferenceData(int sessionId, Int32 sessionId) Which means that the merge tool just added another parameter without asking any questions. Imagine if it was a call to Substring(0) and in another branch it would be Substring(0,2). That is completely different behavior, how does it even get to decide which one to choose? Good thing it came up during compile time. The problem is that it will not be marked as a conflict and will be merged automatically. That is very dangerous behavior and if you don't have the luxury of having a unit test for every line of code - you are screwed. What am I doing wrong and how to do big merges without the merging tool putting in dangerous changes silently? Is there a merge tool that is not language agnostic? I am using Tortoise SVN.

  Read the article

• Finding latest release links on website for C++ Application

  - by Brett Powell

  Basically I have written a game plugin that will allow server admins to update their administration tools from within game rather than having to go download it and install it. The releases are updated regularly, and the beta versions are nightly builds. I am trying to find a way to grab the links from the website, but I cannot think of anyway to do this off of the top of my head. Was hoping someone here might be able to suggest something that would work. http://www.sourcemod.net/snapshots.php Thats the website, basically I am trying to grab the links for the latest stable branch, and latest development branch.

  Read the article

• Specify artifact version outside of pom

  - by Adam B

  Is there a way to specify the artifact version outside of the POM file? I have 2 CI projects that build an artifact. One builds a "stable" development version from a 'develop' branch and the other builds an unstable version which is the result of merging all active feature branches into the develop branch. I want the stable version to build as xyz-1.0.jar and the integration build to go in as xyz-1.0-SNAPSHOT.jar. Is there a way for the CI job to run a maven task or specify via the command line if a release or snapshot jar should be built without manually modifying the POM? Currently I have the version specified as 1.0 in the pom. I considered using the release plugin but I don't want the automatic version number increase and tagging that it does.

  Read the article

• git push hangs and does nothing

  - by coderdave

  I'm new to git and testing it out. I've been able to clone a friends repository make small local changes and commit. I'd like to now test pushing my local changes to the remote repository but unfortunately when I try to do a push $ git push <my friends remote repository <---- hangs here waiting ..I break out by ctr-c Here is some info showing my current status, $ git remote show origin Fetch URL: git://codaset.com/nickbmarine/nickspix.git Push URL: git://codaset.com/nickbmarine/nickspix.git HEAD branch: master Remote branches: Refactor tracked master tracked Local branch configured for 'git pull': master merges with remote master Local ref configured for 'git push': master pushes to master (fast-forwardable) Any idea's?

  Read the article

• svn revert or merge 80 revisions

  - by sharp

  Hi All, Let me explain my scenarios I have branch called ca-dev and its pretty stable,now I have to revert about 100 revisions (ca-dev has about 400 revisions checked in total after it branched out )from different users which were checked in over 4 months before I am branching new branch called agile-dev.Can any body help me best way to do... I tried using tortise svn some got reverted some I got conflicts and I resolved my self blindly so build is breaking. (ofcourse I made a agile-dev-temp) .. any tool better than tortisesvn easily I can view myself and clearly explains. Or who should do it Individual developer? Thanks

  Read the article

• Using local configs in a Heroku deployment environment

  - by ambertch

  I'm trying to migrate my app to Heroku - I have a config file that varies with development/staging/production environments as it contains uniquely assigned keys (from Facebook, S3, etc.), so I keep it out of the repository and keep the configs local. As such I'm trying to find a solution for Heroku to have that config file since Heroku deploys from the repository. I noticed Heroku deploys from the master branch - can it deploy from another branch? Because then I could commit the Heroku configs there, and have it not overwrite the other environments' configs every time it pulls. Thanks!

  Read the article

• Are browsers permitted to render <li>s in any order?

  - by ctford

  As I understand the XML spec, the significance of the order of child elements is not guaranteed. XML parsers tend to keep child elements in the same order as they occur in the XML document, but they are under no obligation to do so. If that's so, then are browsers free to render the <li>s in an <ol> or an <ul> in a different order than they occur in the XHTML? Or is it specified in the XHTML spec somewhere that order has to be preserved? I realise that all major browsers will respect the order of my <li>s. I'm just interested in the academic question of whether or not they are technically obliged to.

  Read the article

< Previous Page | 39 40 41 42 43 44 45 46 47 48 49 50  | Next Page >