Hi I am trying to create a new branch using the API, and have used both PendBranch() and CreateBranch(). The problem with CreateBranch() is it commits immediately and I want to be able to add comments as the branch is checked in. So, I what I did is shown below. Basically I get all the information like server item and local item to be ...
For instance, suppose I have a branch that I want to update with the new stuff in trunk. I've always just merged trunk into the new branch, but I came across a somewhat different process that Divmod uses. Does divmod have some kind of special requirement to do branching like this, or have I been doing it wrong all along? ...
Hi, I am new to Perforce. What would you consider P4 best practices in terms of views/branches. Would you create 1 view with access to many branches, or would you create 1 view / branch ? I am not sure switching between views/worspaces is that easy in Perforce. Thanks, Thomas ...
Crap. I have two working copies of a subversion repository, one of the trunk, and one of a branch I created. Then, I accidentally the deleted the branch in a repository browser. How do I restore the branch? Is there a way to undo the most recent commit for the whole repository? Any help is much appreciated. :-\ ...
OK, here's the process I took... create a new template "Mail Message" create a "__Standard Values" item for the template edit the "Subject" field in the standard values item: "Monthly email newsletter" create a branch for the template do NOT set the Subject field in the branch item create an item from the branch I would expect the...
Say I have branch A in TFS from which I take branch B. Some changesets are made on B, then from B, branch C is taken, and more changes are made on branch C A ------------------------------ | B ----1--2------------------ | C ----3-----4--- Now suppose we want to merge from C into A, but bypassing...
I make a lot of bugfix and feature branches and in the end merge them all into a release candidate (rc). but when i test the rc I am not sure if i have merged in all the branches. How can I find out which branches are missing? I tried gitk, but it seems it shows only the branches that are already merged in the branch that I am on. But I...
We've recently created a branch with a version of code customized for a certain client. We're working on both branches at the same time, commiting 'common' changes into the trunk, then merging them to the branch. Recently, we've come to a troublesome situation. In trunk/bar.c we have (among others) a foo() function. Now, in branch/bar.c...
Hi, it seems to me that keeping the "branch" object in Perforce may not be entirely necessary after an integration has been submitted. I.e. the "real" branch, is actually a folder path, and even if you delete the branch object that was created to perform the integ, the folder path is still valid, and all the files in this path are stil...
What is the concept of switching branches in IntelliJ? I must be either blind or an idiot... I would assume there'd be a "switch to copy" option or something like that, but there is none... EDIT for clarification: my prev IDE had a simple "switch to copy" option, which updated all files being different from current branch/trunk. Intell...
I took over a software project and decided to put everything under SVN (on Assembla) using Tortoise SVN. The trunk is under ROOT. So the trunk contained the whole application (which I tagged 1.0). For my first big feature I created a feature branch named "dev". I could merge changes in the trunk branch into the dev branch without probl...
What is a branch in CVS? ...
I'm in the position of generating a series of documentation patches each of which applies to more than one branch. The project uses Git for version control. The patches should apply cleanly on top of these branches as they are. What is optimal workflow for applying the patches to multiple branches with minimal effort? ...
I was wondering if there is a way to depict that, on an activity that has a decision; one of the branches completely terminates with the activity. This would be similar to a subroutine just returning control to the invoker when a condition is met. sub activity() { ... ... if ( condition ) { ... } else { return;//...
I'm using git (in fact, msysgit) 1.6.4 on Windows. Most of the time I'm doing work in some feature branches. Every now and then, I want to hop back to master to cherry-pick one particular commit I did in my feature branch - usually because it's a useful bugfix which makes sense even without the feature. My workflow is like this - if this...
Here we have have an SVN repository with a trunk and a branch for development on a new release. The branch is nearing ready for release now so I decided to reintegrate the branch back down to the trunk. Obviously there were some conflicts. Including quite a lot of tree conflicts from files that had been deleted in the trunk. I resolved...
Basically, I have dev branch, and what I like to do is to create a feature branch while I implement something, and then merge it back. So situations like the following occurs a b c d - dev / e f - feature Since dev isn't a head, is it still possible to bring dev up to feature such that both dev and feature are pointing to f? I'm...
Do you know a good alternative to redmine or trac which allows such a feature? I've also tried fogbugz, but is too poorly integrated with the svn repository browsing (and there is no sign of code review support). ...
I'm currently using a github repository with a single branch, based of a master branch of another repository. The github branch is a backup of my work, and definitely not meant for pulling, and as such I'm comfortable with rewriting its history when rebasing from the master repository. My problem is that I want a clean history, and if h...
On our TFS server we have a branch structure like this 9 8.3 8.2 8.1 8.0 Where each branch is a child of the branch above it, so that it's easy for developers to merge changes they make to all subsequent versions (e.g. changes in 8.2 up to 8.3 and 9). I now need to add a branch for 8.4 and here is where my problem is occurring. I can...