branch

Is it bad practice to allow dots in SVN tags/branches' names?

In my SVN repository tags are listed by version where name contains dots. e.g. 0.10 or 0.12.1 branches are named like proj-0.24-rc In the same time, for example in Mono project branches has not dots. Is it some practice to avoid dots? Could it be treated like extension delimiter (by web server where repository is been served), etc? ...

SVN branch question

Hi, When creating a branch, what are the implications of selecting the following? Create copy in the repository from: HEAD revision in the repository Specific revision the repository Working copy ...

Is it safe to "branch" a local mercurial repository clone by just copying the entire directory?

If I have a rather large Mercurial project locally, and wish to experiment, can I safely just make a local copy of everything and work there? For instance, let's say I do this: Clone the repository from a central server to a local directory Make some changes, commit them locally, do not push Make a copy of the directory locally Make s...

git-svn branching

Hello, I am using git with an svn repository everything is going fine I did all my branching with git so I did not branch on svn but I branched with git and pushed those branches to a separate location. Then I commited changed from the branch when needed. But now I want to create some branches that actually exist on svn I tried: $ git ...

Undoing branch creation in Mercurial

How can I undo the creation of a branch in Mercurial? For example, if I issue the command hg branch newbranch How can I delete this branch if I decide I entered the wrong name? I'm guessing this must be pretty simple to do, but I have yet to figure it out. Thanks! ...

Why do I get conflicts when Merging a branch to the Trunk and then merging it back to the branch?

Lets say I have a feature branch named "branches/BigFeature". I want to push those changes to the Trunk, make some changes to Trunk and merge back it all back into the "BigFeature" branch so development can continue. My steps were to: Merge the latest changes in Trunk to branches/BigFeature. (Tortoise SVN -> Merge a range of revisio...

Bad idea to force creation of Mercurial remote heads (ie. branches)?

I am developing a centralized web application, and I have a centralized Mercurial repository. Locally I created a branch in my repository hg branch my_branch I then made some changes and committed. Then when I try to push, I get abort: push creates new remote branch 'my_branch'! (did you forget to merge? use push -f to force) I've...

TFS - How to branch again?

I have a large project which I branched to make some changes to the branch. Now I worked on the branch for a while and never branched back to the main. Then I switched back to the main and continued to add more features to the main. Now I need to work again on the previous branch, however I think I need to first update the branch with th...

Is it possible to create a branch from a tag in TortoiseSVN without first checking out the tag from SVN server?

Our trunk directory contains about 100mb of code and we create tags from the trunk directory. Normally, this is not an issue because a tag takes up no space until you need to use it for something. Since branches are created from tags in SVN, how can I create a branch from a tag wtihout first checking out the tag? It appears I need to ...

How do you stop tracking a remote branch in git?

That is, I don't want to actually delete the branch in the remote repository, but I don't want the branch locally anymore. Can I just do git branch -d the_branch and it won't get propagated when I later git push ? Will it only propagate if I were to run git push origin :the_branch later on? ...

Good overview tool / board for visualizing Subversion branch acitivity?

Our team is sometimes finding it a bit confusing and time-consuming to figure out which subversion operations have been perrformed on our different branches in Subversion. Example, when has the Development branch last been merged into the Trunk? When was this particular Tag created, based on what branch etc etc. All of this informati...

how to seamlessly integrate subversion and git?

I'm looking for tips on how to seamlessly integrate subversion and git, for deploying web sites by a small team of web developers. We each have our own development versions of our sites on our local machines. We also have dev, staging, and live servers. As our team has grown, we haven't updated our revision control and deployment strate...

Branch prediction , correlation bit

Problem ; Consider following simplified code fragment; if (d==0) d=1; if (d==1) ... Construct the action table for the 1-bit predictor with 1-bit correlation assuming predictor initialized to NOT TAKEN and the correlation bit is initialized to TAKEN. The value of d alternates 1,2,1,2 Note count the instances of misprediction. I ...

Moving from SVN to HG : branching and backup

My company runs svn right now and we are very familiar with it. However, because we do a lot of concurrent development, merging can become very complicated.. We've been playing with hg and we really like the ability to make fast and effective clones on a per-feature basis. We've got two main issues we'd like to resolve before we move t...

How to catch-up named mercurial branch from default branch without merging the two into one?

I have two branches in mercurial.. default named |r1 |r2 |r3 -------- named branch created here. | |r4 | |r5 | r6 | | |r7 | | -----------> | r8 How do I achieve this catch-up? | | I want to update the named branch from default, but I'm not ready to merge the ...

How to create a sub branch for an existing branch in CVS ?

I created a branch for my sources. I want to create a sub branch for the existing branch. Is it possible using CVS ? ...

How can I "split the branch further" in mercurial?

Admittedly a misleading title, but I didn't know how to put it better. So I made the mistake of pushing all my project specific changes BEFORE I opened a branch. That way, there are some changeset sitting in the default branch that does not belong there. They should be in my newly opened branch. Do I have to backout all the changes...

Eclipse Subversive plugin: Why can't I create this branch?

I recently switched from Subclipse to Subversive for SVN integration in Eclipse, and I'm having trouble creating a branch of my source code. I've tried a few different variations of my method, but they all led me to the same roadblock. Basically, here's what I'm trying to do. Navigator pane Right-click on project folder (want to branc...

Git-svn: managing mutiple remote tracking branchs

Hi all, Currently I'm trying out exporting Git repository history into svn via git-svn and using grafts method. As of now, I have successfully export the git history into svn. But because of the grafting method and that my git repository is cloned from the actual repository, I ended up having TWO remote branches like that of below. o-...

Converting folder copies to branches in TFS 2010

Hi, TFS 2010 introduced the ability to convert basic folders into branches. The documentation also speaks of "reparenting a branch" (which does not appear in source control explorer context menu but is accessible only through File>Source Control> Branching & Merging ... hard to find ...) Let's say I have folders A and A2 under source co...