The situation is as follows: it is necessary to merge in changes from an upstream code base (from V1, to V2), into a third code base S1 that is derived/branched from V1, to produce a new code base S2. We have access to version control for logs and revisions between V1 and V2, and the source of V1, V2 and the source of S1. However, S1 is...
I have the following situation of branches in a Perforce repository: There’s a mainline “trunk” and two release branches “1.0” and “1.1”. A branch “customer” with customer specific changes has been branched off the 1.0 branch. Now the customer wants to move to version 1.1. How can I merge the 1.1 branch into the customer branch? The cust...
Hi all, How I got into a pickle: svn switch http://repo/project/rbanches/branchname/plugins/com.securemacprogramming.myplugin com.securemacprogramming.myplugin What this caused (in addition to "incoming delete on switch" in svn status): svn switch http://repo/project/branches/branchname/plugins/com.securemacprogramming.myplugin com....
Hi there, I have a subversion repository(running svn 1.6.6) on ubuntu linux server and I'm trying to create a branch using tortoise svn GUI; However, I get the error back COPY c:\work\repositoryWorkingcopy\ to http://svnserver/svn/repository/Oct13, Revision HEAD Error '/svn/repository/!svn/bc/234/branches' path not found I ...
is the proper way to hg up bugfix # <-- use that branch hg commit --close-branch hg up another_branch # <-- use another branch hg commit --close-branch hg up default and now hg heads will only show 1 head? Is this the proper way to close unused branches? Looks like if we hg up bugfix again and change some file...
Hello. I'm using git. And previously, I tried to experiment with my program and then, I feel like going back (checkout) to previous commit. Then, I changed something, committed.. etc.. The question is, How do I go back to the state before I checkout. I know I could git checkout the-hash, But I don't know the-hash. git log only show h...
What is the difference between "git branch --track" and "git checkout -b --track", if there is any? ...
How can I configure a Mercurial server to restrict commits to a named branch once it has been closed? I only want the repository administrator to have the ability to reopen the branch. http://mercurial.selenic.com/wiki/PruningDeadBranches says that closed changesets can be identified by "close=1 in the changeset's extra field". It's not...
I am trying to use git as something it wasn't made for - a database. Please feel free to tell me that this is a stupid idea. Setup One branch (let's call it robot) is being updated automatically by a script on a daily basis. The data comes from some other publicly available database. Initially the master branch is the same as the ro...
My requirement is I need the scope of Hudson's environment variable in the subproject's build parameter for svn url. I want to set SVN Branch name as an environment variable of Hudson, as I want it to be used by all my projects configured there. If I access my environment variable [BUILD_BRANCH] as http://svn/repos/project/subproj/bra...
our svn server has a trunk called Dev and Branches live in /Branches/Release/1.0/ /2.0/ /2.3.4/ i cloned it with something like git svn clone -T Dev ... -b Branches ... when I run git branch 2.1 remotes/Release/2.1 i get: fatal: Not a valid object name: 'remotes/Release/2.1'. How do I refer to the...
The scene: A purchased web application, with regular updates from the vendor. We then, heavily customize the look and sometimes add our own functionality or fix a bug before the vendor gets to it. For version control, we have been using Subversion following their “Vendor Branch” model each time we received a new release. This has the ad...
Myself and one other developer had been merging and pushing our work to a non-master branch called toolwork. That way, we didn't impact the rest of the team. My topic branch was called DPM-93 and my git workflow was this. # do some work git checkout DPM-93 git commit -m "did some work" # catch up git checkout toolwork git pull origin t...
I am building a Rails app that I manage with Git. All is perfect, but I'd like keep a public version as well as a private one. That is: the public version is for a public repository (for people to use), and the private version is for my own site. The idea is that both versions should be up-to-date, with the difference that my priv...
I migrated our SVN repository to Git and pushed it to a central repository. We had a fair amount of tags and branches, but somehow we were not able to list and fetch those from a Git client. This was weird, because the tags and branches seemed to be available on the server. With help from a Jon Maddox blog post, a blog post from Marc...
As a followup to my question about unavailable branches after svn to git migration, I have a different problem: I'm unable to push new branches to my central Git repository. $ git clone ssh://server/opt/git/our_app.git $ cd our_app $ git branch my-test-branch $ git checkout my-test-branch $ echo test > test.txt $ git add test.txt $ git ...
I have some general purpose classes in one project that I would like to branch to another unrelated project in another TFS folder that I have mapped to a different workspace. I would prefer branching to plain copying to keep the change history and be able to merge back any changes. However, when I try to branch the file in TFS, it compl...
Possible Duplicate: What is the difference between a tag and a branch in git? What I'd like to do is create checkpoints for different versions of my code. So once I make a bunch of commits, I want to say, "Okay, at this point in the code, this is version 0.1 completed". And then I can make a bunch more commits and do it again ...
Hi, how do I push a commit in two branches? I can't use "git push", because then it pushes to three branches, and i just want the commit in two of them.. Ive tried a "git merge HEAD --commit id from branch A--" in branch B, but then it takes everything from branch A and merges with branch B. I just want the last commit and not ever...
I was asked to grant permissions to several TFS users. These users must have access to one branch only. How can I do this? I'm going to create new TFS user group and deny access to root of Source Control, then allow access to necessary branch. What do you think? ...