branch

Sharing code between solutions in TFS

由 匿名 (未验证) 提交于 2019-12-03 08:30:34
可以将文章内容翻译成中文,广告屏蔽插件可能会导致该功能失效(如失效，请关闭广告屏蔽插件后再试): 问题: I have a few different applications that i need to share code between to reduce maintenance. I have tried to read a lot on stackoverflow and the web in general and it is a fairly common problem; i have not found an answer i like. Our TFS branching structure is like this. We have three branches Development, Main and Production. On the Development branch all active development is done, when we are done with developing new features, we merge it with Main, and then to production. The production branch is always the code running on the servers.

git: put a branch in a subdirectory

由 假如想象 提交于 2019-12-03 08:29:34
问题 I have a git repository (at github.com) with two branches: master and gh-pages. I would like to have the gh-pages branch in a subdirectory, so that I don't need to switch branches every time. repo/ (content of the master branch) gh-pages/ (content of the gh-pages branch) Is that possible ? 回答1: That's not how things are designed to work. You could theoretically clone the repository within a subdirectory of your original clone and mark that directory as excluded from the higher level

How do I identify what branches exist in CVS?

由 情到浓时终转凉″ 提交于 2019-12-03 08:28:14
问题 I have a legacy CVS repository which shall be migrated to Perforce. For each module, I need to identify what branches exist in that module. I just want a list of branch names, no tags. It must be a command line tool, for scripting reasons. For example (assuming there is a cvs-list-branches.sh script): $ ./cvs-list-branches.sh module1 HEAD dev_foobar Release_1_2 Release_1_3 $ 回答1: As a quick hack:) The same stands true for rlog. cvs log -h | awk -F"[.:]" '/^\t/&&$(NF-1)==0{print $1}' | sort -u

Why does git branch -t fail with “Not tracking: ambiguous information”?

由 夙愿已清 提交于 2019-12-03 08:27:52
问题 When I try to create a new branch tracking a remote branch, I get this: $ git branch -t test origin/foo error: Not tracking: ambiguous information for ref refs/remotes/origin/foo The source seems to somehow search for branches to track and throws me out because it finds less more than one, but I don't exactly get what it's looking for since I already told it what to track on the command line. Can anybody tell me what's going on and how to fix it? 回答1: I saw this also when I had two remote

git-p4 migrate branches in different subdirectories

由 喜你入骨 提交于 2019-12-03 08:22:45
I want to migrate source code tree from perforce to git. The source code contains several dev branches scattered across perforce depot, not necessarily in the same directory. for example the structure is something like this - //depot/dev/project/master //depot/dev/project/branch1 //depot/dev/project/branch2 //depot/dev/sub-project/branch3 //depot/dev/sub-project/branch4 //depot/patch-project/branch5 //depot/patch-project/special/developern/branch6 I went though git-p4 documentation https://git-scm.com/docs/git-p4 BRANCH DETECTION section and also similar articles http://forums.perforce.com

How to handle merges with hgsubversion?

由 混江龙づ霸主 提交于 2019-12-03 07:52:47
问题 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 the feature branch, then hg pull which gave me changesets on the default branch. So I did hg merge default , the committed the merge, then tried hg push to send my

Local branches with Bazaar?

由 匿名 (未验证) 提交于 2019-12-03 07:50:05
可以将文章内容翻译成中文,广告屏蔽插件可能会导致该功能失效(如失效，请关闭广告屏蔽插件后再试): 问题: I've been playing around with Git recently to get a grasp of distributed version control. Now I'm looking at Bazaar, but can't figure out how to make a local branch, i.e. a branch that I do not have to push to when I want to commit changes. With Git, I would do git branch branch_name or git checkout -b branch_name I can then work in my local branch, committing changes as I go, without having to push changes to a remote repo. When I'm through with the branch, I can merge it to my local master branch. If I want, I can then push those changes

SVN Mergeinfo properties on paths other than the working copy root

由 匿名 (未验证) 提交于 2019-12-03 07:50:05
可以将文章内容翻译成中文,广告屏蔽插件可能会导致该功能失效(如失效，请关闭广告屏蔽插件后再试): 问题: I have an SVN repository where I have trunk and a branch. I intend to merge the trunk into the branch at regular intervals, however, when I do this I see many property status changes, in addition to actual file content changes. On further investigation the property changes are mergeinfo properties. I wouldn't expect this because we always branch and merge from the top root level. I used the svn propdel command and removed all mergeinfo properties from the branch WC (then reverted the change on the root) before merging trunk in, and the

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

由 旧巷老猫 提交于 2019-12-03 07:48:30
问题 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 trunk branch into the dev branch without problem (as I was doing small bug fixes). Once my feature was complete, I did a merge back into the trunk branch. Everything was working fin up to this point. The

GIT 1.9 - remote: error: 'receive.denyCurrentBranch'

由 匿名 (未验证) 提交于 2019-12-03 07:36:14
可以将文章内容翻译成中文,广告屏蔽插件可能会导致该功能失效(如失效，请关闭广告屏蔽插件后再试): 问题: I have an error using Git 1.9. When I try to "git push" I receive the following error: remote: error: refusing to update checked out branch: refs/heads/master remote: error: By default, updating the current branch in a non-bare repository remote: error: is denied, because it will make the index and work tree inconsistent remote: error: with what you pushed, and will require 'git reset --hard' to match remote: error: the work tree to HEAD. remote: error: remote: error: You can set 'receive.denyCurrentBranch' configuration variable to remote:
订阅 branch