4
голосов
2ответов
315 просмотров

Is there an easy way to change to previously active branch?

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 f...

1
голосов
1ответов
2024 просмотров

UML Activity diagram: decision branch ends whole activity

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...

4
голосов
1ответов
1238 просмотров

Maintaining a patch set for different branches

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 bran...

0
голосов
1ответов
278 просмотров

What is a branch in CVS?

What is a branch in CVS?

20
голосов
3ответов
46978 просмотров

How to 'fix' a SVN branch/tree conflict?

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 trun...

147
голосов
4ответов
47863 просмотров

How do I switch to another subversion branch in Intellij?

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 d...

5
голосов
2ответов
5916 просмотров

What is a branch specification in Perforce?

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, an...

3
голосов
3ответов
178 просмотров

Conflicts when merging into branch some changes in deleted code

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 othe...

4
голосов
3ответов
152 просмотров

how to identify branches that need to get merged in git

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 alread...

4
голосов
1ответов
2777 просмотров

Reparenting a branch in TFS2008

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 ...

0
голосов
3ответов
3860 просмотров

Sitecore values -- Template> Standard Values> Branch> Item

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...

67
голосов
7ответов
34606 просмотров

Need to restore a deleted branch in Subversion

I have two working copies of a Subversion repository, one of the trunk, and one of a branch I created. I accidentally 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?

2
голосов
3ответов
1687 просмотров

What are your Perforce practices for view/branches?

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

3
голосов
2ответов
2412 просмотров

How do I "merge forward" in svn?

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 bee...

2
голосов
1ответов
5202 просмотров

How to create a new source code branch using TFS API?

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...

34
голосов
2ответов
26708 просмотров

SVN: Create a diff for lots of revisions

I had a private branch that I did a ton of commits to, then I merged it into trunk, and did a few little tweaks there. Now the trunk maintainer wants a diff off all of my changes incase we need a rollback. How can I create this? If you need numbers for your examples, assume that 224446 was my...

5
голосов
4ответов
1934 просмотров

same project, multiple customers git workflow

After my first question, id like to have a confirmation about the best git workflow in my case. I have a single django project, hosted at github, and differents clones with each his own branch : customerA, customerB, demo... (think websites) Branches share the same core but have differents data...

5
голосов
3ответов
501 просмотров

Commit a change to more than one branch in Git

Typical usage scenario: I have master, branch_foo and branch_bar. All are up to date. Now, I do a "git checkout master" and work on a bug fix. Lets say that fix was on a tracked file that is in the same state on all branches - ie. before the fix, a diff of the file from each branch results in ...

467
голосов
22ответов
179087 просмотров

Finding a branch point with Git?

I have a repository with branches master and A and lots of merge activity between the two. How can I find the commit in my repository when branch A was created based on master? My repository basically looks like this: -- X -- A -- B -- C -- D -- F (master) \ / \ / ...

13
голосов
2ответов
2371 просмотров

TFS Branching and Disk Space

I've been thinking over some branching strategies (creating branches per feature, maybe per developer since we're a small group) and was wondering if anyone had experienced any issues. Does creating a branch take up much space?

19
голосов
4ответов
14074 просмотров

Branching and Merging Strategies

I have been tasked with coming up with a strategy for branching, merging and releasing over the next 6 months. The complication comes from the fact the we will be running multiple projects all with different code changes and different release dates but approximately the same development start da...

3180
голосов
21ответов
2125172 просмотров

How do you create a remote Git branch?

I created a local branch which I want to 'push' upstream. There is a similar question here on Stack Overflow on how to track a newly created remote branch. However, my workflow is slightly different. First I want to create a local branch, and I will only push it upstream when I'm satisfied and ...

7
голосов
3ответов
801 просмотров

Is there any way to commit changes that I've made to my SVN checkout of trunk to a branch instead?

I just started working on some changes against trunk on an SVN repo, thinking they would be somewhat small. Now, I actually am beginning to realize that I probably should have just started a new branch instead. Rather than making a branch, and then moving each individual piece into it, is there...

1
голосов
4ответов
153 просмотров

Git for game server configuring?

I was wondering if git is suitable for this. So here is the scenario: We are thinking about hosting a game server. However it is not the case of just downloading files and running the server. It needs to be carefully configured and maintained. It also has scripting capabilities. Also, there will...

0
голосов
4ответов
128 просмотров

SVN 'unbranched' files

So we're gradually moving all our projects across into SVN, from CVS. One project in particular has two parallel development streams that share a lot of code, and they accomplish this with a neat trick on branch tags. Some files are branched normally as they diverge on the different streams: foo....

3
голосов
7ответов
2089 просмотров

how do I manage source code using SVN? branching, merging

We are team of 4 developers/friends located in different locations. We all have started working on the a ProjectX and created branches A, B, C and D using Subversion. we have just basic knowledge of version controlling the source code. Other day one of us just tried to merge Branch A with B,C, a...

9
голосов
2ответов
22132 просмотров

Switching branches in git

Sometimes I'm in a feature branch, but I've made an unrelated change that I want to see in master. Often I can just do: git checkout master git commit -m "..." filename But sometimes when I do the checkout I get a warning that there are local changes and thus I can't switch the branch. Why d...

2
голосов
2ответов
178 просмотров

Combining history of merged branches in GIT?

In my git repository, I have merged branch "B" into "master", getting the the following structure: --> A --> B --> C --> D (branch master) | | F --> G --> H (branch B) I now want to combine the branches to get the following history: --> A --&gt...

7
голосов
2ответов
4249 просмотров

SVN partial merge best practices

I am working on a feature branch and have some changes committed to my feature branch that will affect the other developers. I would like to commit those new changes to the trunk so that nobody is left scrambling to fix the break later; however, I do not want to commit the rest of the feature br...

5
голосов
1ответов
746 просмотров

Looking for a suggestion for a git website repository/branch structure

I am looking for suggestions for how to structure projects using git repositories and branches. Assume I want a remote repository, and my project is a website that uses a Flash widget. The Flash widget is compiled from source code that I've written. To deploy my website, I would like the produ...