As the title says I am trying to create a new branch in git on the remote repository. To do this I have previously been using the following command. git push origin origin:refs/heads/rounding_issue Which normally just works and I can then run git branch -r To confirm. This morning however this is not working and I have received t...
Hi, I have the following problem: We have a large product which is in master branch. Also we have other branches that have only few files, the files that are specific to this branch only. Each of those branches represent a plugin to the main product. So for example when you get the main product, you receive lots of files, install them, e...
When I merge a branch back into the trunk using SVN I am advised to merge from the root of the repository. Why is this? (revision numbering?) ...
Hello, I've been testing the branch creation with perforce and I have a question: What is the fastest way to create and point to a new branch in perforce? I've tried several ways and I always need to do a sync on the new branch and later performing the integrate command, but that implies deleting and redownloading on disk all the file...
Our svn-repositories usually consist out of several branches of which 1 is the 'live' version. Currently we make that one the trunk, but this has some drawbacks; everytime we migrate to a new branch, we have to rename the trunk to become a branch or delete it altogether and rename a branch to become the trunk. We would rather have no tru...
I have a big named branch with a lot of changes. Some of these changes are non-destructive so I want to pick these specific files out first, and merge them with default as soon as possible. (Then later, the destructive changes are merged as well.) In Git I would create another branch and squash all changesets outside of the index, then ...
Hi, I'm looking at a way to have a subversion repository to be basically a copy of another subversion repository, except a few files from the other repository that I want to override. Basically, I would want to achieve something like this: / - branches/ - mybranch/ = if files are added in /trunk, they get added here - file1 = lat...
Hi all, i'm preparing a seminary about p4 and i'm trying to find the best way to use the "Task per branch" methodology, now i'm using the following steps: (all by CLI) Set my client to the root depot in order to create the new branches. View: //depot/... //myMachine/... p4 -c myClient integ -v //depot/MAIN/... //depot/myBranchX/... p4...
Have a scenario where we un-intentionally merged a named branch (ABC) into our default branch. hg rollback is not an option because there have been a couple commits since. Is there a way to undo this? ...
Possible Duplicate: How to lock SVN trunk except for merges from branch? I'd like to configure SVN for our development team to enforce: 1) All developers must work on a branch until they are happy to commit a changeset to the trunk 2) To prevent developers working directly on the trunk I'd like to disallow direct commits to t...
I'd like to prevent developers working directly on the trunk. I'm aiming to enforce all developers off the trunk and to work on there own branches until CI tests are cleared. They then have to merge from the trunk to their branch (to pick up latest changes), run and pass tests before they merge back to the trunk. Is there any rules fo...
I needed to do some feature development on a branch, so I created one and now I've merged it back into trunk. The question is, what do I do with that branch? What's the wise thing to do? Do I remove it from the repos? It feels untidy and unnecessary to just leave it there. ...
I look at Mercurial repositories of some known products, like TortoiseHg and Python, and even though I can see multiple people committing changes, the timeline always looks pretty clean, with just one branch moving forward. However, let's say you have 14 people working on the same product, won't this quickly get into a branch nightmare ...
Obviously with return only in the case that the method can immediately exit for (...) { return; } or for () { break; } Which is better? ...
I had a weird situation today.. I'll try and recreate what I think happened. I wanted to move a speculative change (made to a_file) to a new branch and continue working on the main branch without it. On master with a_file and b_file dirty I did: git checkout -b saved_feature git commit a_file -m "Putting this modification on a differ...
We recently moved from SVN to Git, but there's a single legacy branch that I need to bring in to the Git repository. The SVN and Git repositories are the same logical code (i.e. they're both called foo-lib), but the Git one has newer revisions from after we switched to Git. Is there a way we can use git-svn to grab the history of a spec...
I have tried. My working copy is based on but a modified version of svn://foo.net/svn/repo/branch/yyy I want to diff against branch xxx. I have tried svn diff --old=svn://foo.net/svn/repo/branch/xxx --new=. but that only seems like shorthand for svn diff --old=svn://foo.net/svn/repo/branch/xxx --new=svn://foo.net/svn/repo/bran...
Is Mercurial always using the external merge tools when two branches that are merging have changes to the same file? Or does it first see if it can merge the file itself, and only punting to the external tool if it can't? The reason I'm asking is that I am (once again) re-reading the tutorial written by Joel Spolsky on Mercurial and on...
I'm trying to determine how people use "branch repositories" while also using subrepos. Let's say I have repo Main containing a solution file (.NET), and populated with subrepos A, B, C: /Main - A - B - C MainSolution.sln A, B, and C, while being shared between other "Main" repos, are very tightly integrated into Main...
Could you please suggest an article, a book, or a conference paper about possible problems a software team may experience with branching in version control environment? We're creating a summary for one of our sponsors, and need to quote respectable sources of information. So far I've found short reviews by Chris Birmele and Eric Sink. T...