Search Results

Search found 6909 results on 277 pages for 'filter branch'.

Page 1/277 | 1 2 3 4 5 6 7 8 9 10 11 12  | Next Page >

• SVN Working Copy to Different Branch Merge Without Commit to Working Copy Branch

  - by Q Boiler

  If a working copy (local copy) was created from a branch, lets call it A. Coding was done in branch A, but branch A was "Closed" to commits, and branch b was opened. How do I merge my working copy changes into Branch B and commit to branch B, without commiting my changes to branch A first. Trunk - branch A. I checked out branch A and made…

  Read the article

• To branch or not to branch?

  - by Idsa

  Till recently my development workflow was the following: Get the feature from product owner Make a branch (if feature is more than 1 day) Implement it in a branch Merge changes from main branch to my branch (to reduce conflicts during backward merging) Merge my branch back to main branch Sometimes there were problems with merging, but in…

  Read the article

• How-to filter table filter input to only allow numeric input

  - by frank.nimphius

  In a previous ADF Code Corner post, I explained how to change the table filter behavior by intercepting the query condition in a query filter. See sample #30 at http://www.oracle.com/technetwork/developer-tools/adf/learnmore/index-101235.html In this OTN Harvest post I explain how to prevent users from providing invalid character entries…

  Read the article

• Mercurial branching a branch doesn't display right in hg serve or hg view

  - by Mystic

  I've been doing some development on a branch and realized that before it could be complete something else need to be done first. I decided that I would branch my current branch and do the requiste changes in that branch then merge them back together and then merge my working branch into default. Basically I expected this: | | + requiste…

  Read the article

• Commit changes to a different branch than the currently checked out branch with subversion

  - by Paul Alexander

  I've been working on code checked out from the development line and discovered that the changes made might be breaking changes and need to be moved to an experimental branch before committing to the main dev tree. However, I don't have the experimental branch checked out and I don't want to loose the changes that have already been made. …

  Read the article

• Branch view for a file that has been split into multiple files

  - by ScottJ

  I have a large source file in Perforce that has been split up into several smaller files in a branch. I want to create a branch view that can handle this, but perforce (2009.1) only sees the last of the multiple files. For example, I created: p4 integrate //depot/original/huge_file.c //depot/new/huge_file.c Later I split the huge file…

  Read the article

• Capturing and Transforming ASP.NET Output with Response.Filter

  - by Rick Strahl

  During one of my Handlers and Modules session at DevConnections this week one of the attendees asked a question that I didn’t have an immediate answer for. Basically he wanted to capture response output completely and then apply some filtering to the output – effectively injecting some additional content into the page AFTER the page had…

  Read the article

• Git: What is a tracking branch?

  - by jerhinesmith

  Can someone explain a "tracking branch" as it applies to git? Here's the definition from git-scm.com: A 'tracking branch' in Git is a local branch that is connected to a remote branch. When you push and pull on that branch, it automatically pushes and pulls to the remote branch that it is connected with. Use this if…

  Read the article

• Subterranean IL: Filter exception handlers

  - by Simon Cooper

  Filter handlers are the second type of exception handler that aren't accessible from C#. Unlike the other handler types, which have defined conditions for when the handlers execute, filter lets you use custom logic to determine whether the handler should be run. However, similar to a catch block, the filter block does not get run if…

  Read the article

• Simple Branching and Merging with SVN

  Its a good idea not to do too much work without checking something into source control.  By too much work I mean typically on the order of a couple of hours at most, and certainly its a good practice to check in anything you have before you leave the office for the day.  But what if your changes break the build (on the…

  Read the article

• Git-svn branch hoses dcommit when using an odd branch structure

  - by Chuck Vose

  I had a boss, past-tense, who decided to put svn branches in the same folder as trunk. Normally, this wouldn't affect me that much but since I'm using git-svn things are going so well. After I did a fetch it created a folder for each branch in my root folder so I have three folders, drupal, trunk, and client. The drupal folder…

  Read the article

• Git: Create a branch from unstagged/uncommited changes on master

  - by knoopx

  Context: I'm working on master adding a simple feature. After a few minutes I realize it was not so simple and it should have been better to work into a new branch. This always happens to me and I have no idea how to switch to another branch and take all these uncommited changes with me leaving the master branch clean. I…

  Read the article

• How to find if a branch is a locally tracked branch or user created local branch?

  - by Senthil A Kumar

  I have a remote tracking branch tracked locally in my local repository using 'git branch -b branch-name origin/branch-name'. My remote branch is test2/test2 (origin/branch-name) which is being tracked locally as test2. The origin is also named test2. I haven't checked-out my local tracking branch test2. When i do a 'git…

  Read the article

• Merge only a one remote branch into a local branch with Mercurial

  - by Pepijn

  I wan to manage some profiles as XML files in Mercurial repos. The setup I'm thinking of: Each user has a repo with a branch where he manages his own profile, and a number of branches where he can pull and merge other profiles from that branch of another user. So for example I have my own profile branch and a branch…

  Read the article

• Java: If vs. Switch

  - by _ande_turner_

  I have a piece of code with a) which I replaced with b) purely for legibility ... a) if ( WORD[ INDEX ] == 'A' ) branch = BRANCH.A; /* B through to Y */ if ( WORD[ INDEX ] == 'Z' ) branch = BRANCH.Z; b) switch ( WORD[ INDEX ] ) { case 'A' : branch = BRANCH.A; break; /* B through to Y */ case 'Z' :…

  Read the article

• How do you Remove an Invalid Remote Branch Reference from Git?

  - by Casey

  In my current repo I have the following output: $ git branch -a * master remotes/origin/master remotes/public/master I want to delete 'remotes/public/master' from the branch list: $ git branch -d remotes/public/master error: branch 'remotes/public/master' not found. Also, the output of 'git remote' is…

  Read the article

• GIT : I keep having to merge my new branch

  - by mnml

  Hi, I have created a new branch and I'm working on it with others dev but for reasons when I want to push my new commits I always have to git merge origin/mynewbranch Otherwise I'm getting some errors: ! [rejected] mynewbranch -> mynewbranch (non-fast-forward) error: failed to push some refs to…

  Read the article

• Modify the filter chain - Or select servlet to respond to request using filter

  - by klonq

  I am trying to use a filter to map requests. I am trying to do this for two reasons, firstly to dynamically generate URI's and have them mapped to the appropriate servlet and secondly to catch URI's which are not registered and handle them appropriately. So I'm using a catch-all filter to process the URI…

  Read the article

• How to get the changes on a branch in git

  - by Greg Hewgill

  What is the best way to get a log of commits on a branch since the time it was branched from the current branch? My solution so far is: git log $(git merge-base HEAD branch)..branch The documentation for git-diff indicates that "git diff A...B" is equivalent to "git diff $(git-merge-base A B) B". On…

  Read the article

• I have a filter for jquery masonry - but I want to filter moomasonry

  - by Jason

  Hi, I'm using jquery masonry for layout. But I am considering moving to mootools. I have found a masonry port to mootools, called moomasonry - http://www.crionics.com/products/opensource/mooMasonry/Demos/basic.html With help here, I have a filter on the masonry divs by class: …

  Read the article

• How to filter the jqGrid data NOT using the built in search/filter box

  - by Jimbo

  I want users to be able to filter grid data without using the intrinsic search box. I have created two input fields for date (from and to) and now need to tell the grid to adopt this as its filter and then to request new data. Forging a server request for grid data (bypassing the…

  Read the article

• Using svn diff after reintegration of branch

  - by manu08

  Consider these steps: Create a svn branch Add several new files to the branch Reintegrate the branch into a local copy of the trunk Run svn diff on the local trunk copy The issue is that svn diff doesn't detect any changes. It ignores the new files because they are marked as…

  Read the article

• How to merge a "branch" that isn't really a branch (wasn't created by an svn copy)

  - by MatrixFrog

  I'm working on a team with lots of people who are pretty unfamiliar with the concepts of version control systems, and are just kind of doing whatever seems to work, by trial and error. Someone created a "branch" from the trunk that is not ancestrally related to the trunk. My…

  Read the article

• Exclude filter from certain url's

  - by Mads Mobæk

  I'm using a filter in web.xml to check if a user is logged in or not: <filter> <filter-name>LoginFilter</filter-name> <filter-class>com.mycompany.LoginFilter</filter-class> </filter> <filter-mapping> …

  Read the article

• How to select number of lines from large text files?

  - by MiNdFrEaK

  I was wondering how to select number of lines from a certain text file. As an example: I have a text file containing the following lines: branch 27 : rect id 23400 rect: -115.475609 -115.474907 31.393650 31.411301 branch 28 : rect id 23398 rect:…

  Read the article

1 2 3 4 5 6 7 8 9 10 11 12  | Next Page >