I'm relatively new to source control (at least complex source control). If I'm developing a set of features in a branch, and I happen to delete some cruft out of the source tree in this branch, what happens when I merge? Are the files properly deleted in the trunk/master? Is there anything I should avoid doing that is typically problem...
Having read Martin Fowlers "Feature Branch" and Flickrs "Flipping Out" I guess there are a few guys out there who do: all (or most) development on Trunk release Trunk regularly (assuming updating your web site) not-yet-approved or not-yet-finished features should not be visible/have no impact on the regular user I've got 2 questions:...
I created a new branch using this command: hg branch new_branch After the first commit to the new branch, the default branch becomes inactive. If this is pushed the central repository will have only one head which belongs to the new branch. When my colleague pushes his commits on the default branch, he will get this error: pushing to...
I have a following scenario: 3 branches: - Master - MyBranch branched off Master for the purpose of developing a new feature of the system - MyBranchLocal branched off MyBranch as my local copy of the branch MyBranch is being rebased against and pushed to by other developers (who are working on the same feature as I am). As the ow...
Coming from svn, just starting to become familiar with git. When a branch is deleted in git, is it removed from the history? In svn, you can easily recover a branch by reverting the delete operation (reverse merge). Like all deletes in svn, the branch is never really deleted, it's just removed from the current tree. If the branch is ...
I have a product that I distribute to my clients. Each client needs some UI customization. I want each client to be able to get updated with new version easily. Can I create a project in svn that serves as a "base project", and then create branches for each client? With that said, will I then be able to commit changes in a branch to the...
I am trying to contribute to a project that uses Subversion. I used Mercurial and its hgsubversion extension to clone the repo. My work takes place on a feature branch. How do I keep the feature branch up to date with stuff that happens on the default branch (hg speak) aka the trunk (svn speak)? So I used hg up feature to update to t...
I'm trying to understand whether subversion has its own mechanisms for regulating concurrent user activities on the trunk (IE a branch/tag action and a commit action happening at the same time) or if it's up to the users to sync between themselves before acting on the trunk. I've been trying to find documentation about this on the net ...
How do I copy all files in a directory from another branch? I can list all of the files in that directory by doing git ls-tree master:dirname I can then copy all of the files individually by doing git checkout master -- dirname/filename However, using wildcards has so far been a total fail. git checkout master -- dirname/*.png ...
Hi, I think there's something I don't understand about Branching How can I run my website from localhost to test my changes made on a Branch Let's say my branch structure is -Dev -UI -App Main -UI -App The project UI and App from the main are map in my IIS, it's all working well Now I want to make some changes in the UI projec...
I have a git repo which has a few branches - there's the master branch, which is our stable working version, and then there is a development/staging branch which we're doing new work in. Unfortunately it would appear that without thinking I was a bit overzealous with rebasing and have pulled all of the staging code into Master over a pe...
I have a copy of the contents of an svn branch locally without any .svn folders. The equivalent of the output of an svn export of that branch. I'd like to link up this directory to its corresponding branch in version control, without having to do an svn checkout followed by manually merging my changes in. Is there some way to do this ea...
I'm having problems getting my processor to simulate correctly and I think I've narrowed it down to the program I'm giving it. 1. li $R1, 0 2. li $R2, 0x100 3. li $R6, 1 4. li $R8, 0 5. li $R9, 20 6. lw $R3, 0($R1) 7. lw $R4, 4($R1) 8. add $R5, $R3, $R4 9. srlv $R5, $R5, $R6 10. sw $R5, 0($R2) 11. ad...
We are using separate branches for separate features and we need to visualize these brances. Is there a tool that can help us? We do not need a tool that uses our source-repository to generate the graph. We want to use the tool for planning new branches and for visalizing them. ...
I work for a web development company that uses Mercurial as its DVCS of choice. We're currently in the process of creating a new version of a site that is already in production. Both a stable and a development branch of the site exist in the same repository. The production site runs off the stable branch, and developers obviously code a...
I try to use: cleatool lstype lbtype:some_label but the output does not tell me which branch the label is in. So I need your help. ...
If I compile branch A, then switch to branch B, compile, and switch back to branch A. All the object files touched by the compile of branch B have to be recompiled! Normally one does not check-in object files, but there seems little choice here. What are the ideal working practices here? ...
is it possible to rebase a branch with all it's subbranches in git? i often use branches as quick/mutable tags to mark certain commits. * master * * featureA-finished * * origin/master now i want to rebase -i master onto origin/master, to change/reword the commit featureA-finished^ after git rebase -i --onto origin/master origin/mas...
As title says. Current working copy is fully committed, i go to Subversion > Switch, change the url from the current branch to the trunk, receive a popup that says Working copy not locked The working copy lock appears to be broken Any ideas why? ...
Hi, I'm currently working on a branch and want some commits to merge into other branches: /--a--b--c--d--e--f--g----- branchA (letters are commits) --o--------------------------- master \-------------------------- branchB However I noticed that it would be a good idea to pool some commits. I want to "concatenate" commit a, d, e...