branch

2-Version software: Best VCS approach?

由 岁酱吖の 提交于 2019-12-09 06:59:23
问题 I suppose I'd better explain my situation: I'm in the process of developing some software, and I'm at the stage where I'd like to split my project into two branches which differ in features. It so happens that this application is an Android application which I will be deploying on the Market, which has the constraint that every app must have a unique package identifier (sensible, no?). My current approach has been to clone the git repo of my original project, but this causes issues with

Keeping track of source code variants

由 狂风中的少年 提交于 2019-12-09 06:07:38
问题 I am soon starting to maintain a line of products containing variants of the same embedded software. Since I've been playing with git for one year and appreciate it very much, I'm likely to use it for source control. There are several options I can see for maintaining the variants of the firmware, but none pleases me too much. What are the best practices you apply for your own work? Alternatives I can think of: defines . Pre-processing. Pros: everything is always present in the source code,

How should gitflow hotfixes work?

由 本秂侑毒 提交于 2019-12-09 05:40:49
问题 We use Gitflow for our web builds, and I have a question about how hotfixes are supposed to work. But first I should explain that we don't quite use the normal Gitflow workflow. I understand that usually you would branch your features , they would merge into develop when finished, you would create your release , release gets merged into master and you deploy that, as an actual "versioned release". However, as this is client work, we don't do "releases", instead features are deployed as and

what determines default branch when cloning from git bare repository

由 ＊爱你＆永不变心＊ 提交于 2019-12-09 05:10:26
I'm trying to change the default branch when cloning from a git bare repo using git 1.8.3.1 from yum install. I had always assumed that the way to do this would be to change the reference inside the HEAD file of the remote repo, and several SO answers seem to confirm this. However, I'm finding the value of HEAD in the remote bare repo to have no effect . Even though my remote repo has this value in HEAD: ref: refs/heads/secondbranch I'm still defaulted to firstbranch branch when I clone! Any ideas what's going on here? Where else might this info be stored? Old versions of git do not send the

warning: refname 'xxx' is ambiguous when using git-svn

由 家住魔仙堡 提交于 2019-12-08 23:01:46
问题 I am using git as a frontend to Subversion (via git svn). So, for every svn trunk/branch I have remote branch in git named "remotes/xxx". For example "remotes/trunk", "remotes/coolfeature". Now I want have one "default" local branch for every remote branch, to use it for dcommit. The problem is that I want such branches to be named after Subversion branches, like "trunk", "coolfeature", so I have the following branches in git: trunk coolfeature remotes/trunk remotes/coolfeature The problem is

Is there anything like branch/jump table in Java?

由 三世轮回 提交于 2019-12-08 19:47:46
问题 Does Java have something similar to a branch or jump table? A branch or jump table table is, according to wikipedia, a term used to describe an efficient method of transferring program control (branching) to another part of a program (or a different program that may have been dynamically loaded) using a table of branch instructions. Does Java have something like this or do I just have to use if/else if/else or case statements? 回答1: Java has a switch statement, but whether it compiles to a

Mercurial: Granular Repositories Vs large Repositories and shared third party tools in version control

由 只愿长相守 提交于 2019-12-08 19:36:09
问题 This question was migrated from Software Engineering Stack Exchange because it can be answered on Stack Overflow. Migrated 8 years ago . Scenario: Various products made up combinations of the smaller projects. A few different versions of each product in dev, release and maintennace (bugs/patches/minor releases). Most the the team use various third party tools and libraries for dev and for release (common two are XUnit for dev, and AutoMapper in product). They're fans of version controlling

Get revision number of a tagged file in WinCvs

由 我与影子孤独终老i 提交于 2019-12-08 17:24:48
问题 This seems like it should be so simple, but I can't find any solution that appears to work... I need a CVS command that given the name of a tag that you have applied to a file, it will give you the revision number. CVS Tree structure: (filename) | +--> 1.1-----(branch) | | | 1.1.1.1---(tag1) | | | 1.1.1.2---(tag2) | | | 1.1.1.3---(tag3) | | | : 1.2 | | : For example: Using a CVS command, given the tag name "tag2", how can I get CVS to give me the revision number "1.1.1.2"? The closest thing I

Branching from a Tag

由 China☆狼群 提交于 2019-12-08 17:23:12
问题 I'm seeking opinions here. The following may be considered either an SVN-specific question, or a more general version control question. If the sources of a project are to be branched at a point corresponding to a release, perhaps for maintenance work, is it preferable to: (a) branch from the tag, or (b) branch from the node (e.g. on the trunk) that the tag copies? What are the pros and cons of these two approaches? Does it matter at all? Thanks. 回答1: I'd suggest (b) since that will allow you

Remove a single merged branch from master branch

由 血红的双手。 提交于 2019-12-08 17:21:01
问题 In my master branch, there're following local branches that have been merged, but I would like to remove the local_branch3 from master: local_branch1 local_branch2 local_branch3 local_branch4 after removing the local_branch3 from master, I would like it to remain a local branch (only deleted from master). I've check Steve Harman's blog on this similar issue, but that seems also deleting the local branch for ever. Edit: to clarify what I meant, as I posted in one of the below comments: I would
订阅 branch