[git-users] Proper git model for multiple instance
Hi All, I've stepped in a company that runs an existing CMS for their main website. They asked me a while ago to setup 5 new websites with that CMS. I've decided to have the original as branch MASTER and the other 5 as separate branches. When I make a feature/bug fix that needs to propagate to all versions, I create new branch, fix bug, and merge the change to all branches. Although it works, I don't like the idea of having all different websites in one repository. I'd rather have 6 different repositories (each website it's own) and fix bugs separately and merge to all repositories at the end. Does that make sense? What model would you prefer? Thanks, Michal -- You received this message because you are subscribed to the Google Groups Git for human beings group. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
[git-users] Re: git-svn: mapping individual subversion branches
Hi all,
Am 2012-01-25 09:59, schrieb chris:
I'm trying to convert a couple of Subversion repositories to git. The
structure looks like this:
/
+ project1
+ trunk
+ src
+ tags
+ 1.0rc1
+ src
+ branches
+ 1.x
+ src
+ releases
+ 1.0
+ src
+ project2
+ trunk
+ tags
+ branches
+ releases
+ some_branch
+ src
[...]
But how do I map the single branch some_branch in project2?
I have exact the same problem.
I'm also an absolute beginner with git, which makes it difficult for me to
follow Thomas' suggestion with grafting the history as shown in his
screencast. (And at my early learning stage, this problem looks like a true
dilemma: In order to solve the problem, one had to be more familiar with
git first, but to become more familiar with git, this problem would ideally
be solved first...)
However, I found the http://schacon.github.com/git/git-svn.html page very
helpful. In section CONFIGURATION, it says:
It is also possible to fetch a subset of branches or tags by using a
comma-separated list of names within braces. For example: [...]
In my case, I had only imported the trunk earlier, as my project has no
normal branches like project2/branches/... in the example above.
So I just added a line like
branches = project2/{some_branch}:refs/remotes/branches/*
to the config file, and after
git svn fetch
gitk --all
things are looking pretty good: Only the occasional/intermediate
integration of some_branch into the trunk that is in the SVN repository
is missing in git (but maybe this is something to be fixed with grafting
later(?)).
However, I too would be interested in what the git experts think.
Is this a good solution?
Is there a better / more natural solution?
Best regards,
Carsten
--
Cafu - the open-source Game and Graphics Engine
for multiplayer, cross-platform, real-time 3D Action
Learn more at http://www.cafu.de
--
You received this message because you are subscribed to the Google Groups Git
for human beings group.
To view this discussion on the web visit
https://groups.google.com/d/msg/git-users/-/U89FM4XFE-EJ.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/git-users?hl=en.
[git-users] Re: git-svn: mapping individual subversion branches
+ project2 + trunk + tags + branches + releases + some_branch + src [...] But how do I map the single branch some_branch in project2? Just for the record: I got a direct reply stating: Use git config --add svn-remote.svn.fetch project2/some_branch:refs/remotes/git-svn/some_branch which worked like a charm for individual branches. I haven't grafted the history though. Hope that helps, Chris -- You received this message because you are subscribed to the Google Groups Git for human beings group. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
[git-users] Re: Proper git model for multiple instance
I think you need to say a little more of the 5 websites. Is it 5 different applications, based on common libraries? How much commonality is it? Do they depend on each other in release cycles? Maybe it is the same product, tweaked to support 5 major customers with various requirements? -- You received this message because you are subscribed to the Google Groups Git for human beings group. To view this discussion on the web visit https://groups.google.com/d/msg/git-users/-/mbpSk4AoLqAJ. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
[git-users] Re: git format-patch does not apply
On Jan 22, 12:23 am, Thomas Ferris Nicolaisen tfn...@gmail.com wrote: I think the details must be in what was inside these commits. Would be interesting if you can share a repository where you can recreate this. I was not able to reproduce this problem on a new repository. Finally, I solved it with the help of git diff and patch, which worked just fine. Once I push the changes to a public repository I will send you the address along with the patch if you are interested. The problem can easily be recreated by resetting to a certain commit and by applying the patch. I have already made sure that the problem can still be reproduced on a trash branch. So long, Johannes -- You received this message because you are subscribed to the Google Groups Git for human beings group. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
