[git-users] Using git with VIsual Studio 2015

['SagaV' via Git for human beings]

Hi all,

I am involved in getting git working with Visual Studio 2015 with a repo on 
a separate centralized computer ("server") running Windows 10. The 
objective is to have 3 - 5 developers work on the same project where the 
master copy of the project is stored on the git "server".

I have done research and have found information on how to accomplish 
various tasks:

Installed git on "server" computer
Created a folder for repos, created bare project repo
Shared folder so that developers can access it
Set up remote access for maintenance work

I also installed git on a test workstation with VS2015 (client). I assume 
that git has to be installed on the server and the client.

I am now at the point where I need to take an existing VS2015 project and 
add it to the bare repo that I created on the server. I found information 
about this also, but I am stuck in that I am not understand the exact 
procedure to set this up.

For example, will the client also have a repo? I understand the local work 
and staging  areas, but not sure if I also need a repo on the client or 
whether the client will be using the master on the centralized computer 
directly. Do I add the project directly on the server, or can I do this 
from the client?

I need a push in the right direction. Any orientation is appreciated, or a 
reference to material that I can read. Everything helps! Thank you for your 
time and effort. Saga

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/git-users/1ff81ad9-9082-43e8-823c-dafbfbfe82a4n%40googlegroups.com.

[git-users] Using git reference clone in combination with git submodule

[extzig]

Hi,

I have a monolithc git repo containing multiple projects each developer 
have there own local git reference repo so that they don't have to do a 
complete clone when working in different projects. For some reason we now 
have to add a git submodule in this repo but we are encountering some 
issues with the submodule everytime the submodule is bumped up. The git 
submodule is used only by one of the project but when the submodule gets 
bumped up to a new sha all other developers running git pull/fetch will 
encounter the issue "Could not access submodule" if they run the command a 
second time it works. Would really appreciate any help on this.

Thanks

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/git-users/07317ea5-5a0c-413b-9f4f-3976fffb591a%40googlegroups.com.

Re: [git-users] Using git gui to do a rebase

[Philip Oakley]

I don't think you can. I've not seen any option to do it via the Git-Gui, 
though others may know better.


Philip

- Original Message - 
From: "Michael" 

To: 
Sent: Sunday, June 17, 2018 2:44 AM
Subject: [git-users] Using git gui to do a rebase



How do I do a rebase in git gui?

---
Entertaining minecraft videos
http://YouTube.com/keybounce



--
You received this message because you are subscribed to the Google Groups "Git for 
human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

[git-users] Using git gui to do a rebase

[Michael]

How do I do a rebase in git gui?

---
Entertaining minecraft videos
http://YouTube.com/keybounce

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Re: [git-users] Using Git as a NoSQL database

[Michael]

So reading that, by the time you are done, it looks like you have redone 
everything that git add/commit normally do.

What do you gain by trying to script the plumbing commands directly, rather 
than using the existing porcelain?

On 2016-10-14, at 9:40 AM, Sidney Souza  wrote:

> Awesome Post.
> 
> Congratulations for you.
> 
> I will study more about this topic because it seems interesting for me.
> 
> Thanks for your share
> 
> On Thursday, October 13, 2016 at 7:43:13 AM UTC-3, Kenneth Truyers wrote:
> Hi all,
> 
> Recently I have been using Git as a NoSQL database.
> 
> I have written down my thoughts in a blog post: 
> https://www.kenneth-truyers.net/2016/10/13/git-nosql-database/
> 
> It would be great if I could get some feedback on it.
> 
> Thanks!
> 
> -- 
> You received this message because you are subscribed to the Google Groups 
> "Git for human beings" group.
> To unsubscribe from this group and stop receiving emails from it, send an 
> email to git-users+unsubscr...@googlegroups.com.
> For more options, visit https://groups.google.com/d/optout.

---
Entertaining minecraft videos
http://YouTube.com/keybounce

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Re: [git-users] Using git in an unusual way, need advice

[Konstantin Khomoutov]

On Tue, 18 Oct 2016 07:08:00 -0400
rhkra...@gmail.com wrote:

> I sent this and the next email to another list and didn't get any
> response-- I've partially resolved my issue (see next post), and I'm
> also beginning to understand that branches might also solve my issue
> (but patches see more straightforward.
> 
> I'm resending it here as I welcome comments and suggestions:
[...]

No, both of your original posts came where it was intended.
You can see all four your posts and my answer at [1].

1. https://groups.google.com/d/topic/git-users/iqYZw9Akkno/discussion

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

[git-users] Using git in an unusual way, need advice

[rhkramer]

I sent this and the next email to another list and didn't get any response--
I've partially resolved my issue (see next post), and I'm also beginning to 
understand that branches might also solve my issue (but patches see more 
straightforward.

I'm resending it here as I welcome comments and suggestions:

Original email:

I am probably using git in an unusual way.

I want to do some development for a project that is managed by Mercurial 
(scite / scintilla), but, for the sake of learning git (and minimizing the 
need to learn anything else)  I want to use git for the work I do.

I've downloaded the source code as tarballs (which are available--I could also 
have downloaded the source code using Mercurial, but, as long as the tarballs 
are available, I'd prefer to do it using tarballs).

I originally downloaded version 3.66 of the source code, untarred it into a 
working directory, initialized a git repository, and then added and committed 
the source code to the git repository.

So far, I haven't actually made any changes to the source code.

Now version 3.70 is available, and I sort of repeated the process, that is, I 
untarred the new version into the working directory that I had previously 
created, then did a git status--it seemed to recognize the modified files, 
which 
I then added and committed.

So far, so good.

But, I'm not sure how to handle further updates after I've made local changes 
to the source code.

The one approach I can think of is to create a patch file before I download the 
next update, then download and untar the next update, and then apply that 
patch file (while doing git adds and commits at the appropriate times, which I 
have to think about).

But the patch file approach seems rather cumbersome and un-git (and un-CMS) 
like--is there a better approach?

Thanks!

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Re: [git-users] Using git in an unusual way, need advice

[Konstantin Khomoutov]

On Sun, 16 Oct 2016 21:39:41 -0400
rhkra...@gmail.com wrote:

> I am probably using git in an unusual way.
> 
> I want to do some development for a project that is managed by
> Mercurial (scite / scintilla), but, for the sake of learning git (and
> minimizing the need to learn anything else)  I want to use git for
> the work I do.
> 
> I've downloaded the source code as tarballs (which are available--I
> could also have downloaded the source code using Mercurial, but, as
> long as the tarballs are available, I'd prefer to do it using
> tarballs).
> 
> I originally downloaded version 3.66 of the source code, untarred it
> into a working directory, initialized a git repository, and then
> added and committed the source code to the git repository.
> 
> So far, I haven't actually made any changes to the source code.
> 
> Now version 3.70 is available, and I sort of repeated the process,
> that is, I untarred the new version into the working directory that I
> had previously created, then did a git status--it seemed to recognize
> the modified files, which I then added and committed.
> 
> So far, so good.
> 
> But, I'm not sure how to handle further updates after I've made local
> changes to the source code.
> 
> The one approach I can think of is to create a patch file before I
> download the next update, then download and untar the next update,
> and then apply that patch file (while doing git adds and commits at
> the appropriate times, which I have to think about).
> 
> But the patch file approach seems rather cumbersome and un-git (and
> un-CMS) like--is there a better approach?


Well, two points here.

The first one: why not use a Git-to-Hg "bridge" to natively work with a
remote Mercurial repository?  One such bridge is [1]; the project's
README file contains pointers to other implementations and the
comparison of them.

This approach allows you to use your CMS of choice to work on the
project while not inventing ad-hoc solutions for bringing in upstream
changes over time.

So OK, let's supposed you did know such solutions exist but consciously
decided to avoid them for whatever reason.
If we only consider your current workflow, I see two issues with it
(and that's the second point).

First, simple untarring of a new upstream tarball and running
`git add -u` on the results is not enough: this does not take care of
the files _deleted_ by upstream in the new release.

What you really need to do is:

1) Delete everything from the work tree and the index:

   git rm -rf .

2) Unpack your tarball.

3) Stage the new contents:

   git add .

4) Commit.

Second, there's no sense to use patches because commits on Git
branches represent changes in a much more convenient way than patches.
While commits are _not_ patches in Git, this is merely an
implementation detail, and each of them still constitutes a changeset.
You can easily see what changes a commit introduced (compared to its
parent commit) by running

  git show 

Another fact is that Git was expliticly created to support certain
workflows involving patches -- namely, generating patch series and
sending them to a mailing list, and applying a patch series from a
mailbox file.

Hence, if you refuse to use a Git-to-Hg bridge for some reason I
suggest you to use normal Git branches to track your changes.

Basically, the workflow would be something like this:

1) Bring a new upstream release in -- recording a commit on some
   dedicated branch (I'd name it "upstream").

2) Fork a branch off that commit.  Let's call it "devel".

3) Implement whatever set of changes you need there.

   Record a commit for each.  Feel free to use `git rebase` to massage
   that history until you're OK with exporting it.

4) Use `git format-patch` to prepare a set of patches to send.

   Note that `git send-email` is able to mail it right away to the
   specified address.

5) Once the new upstream release comes out, repeat step (1)
   and then `git rebase` your "devel" onto the new tip of "upstream".

6) Repeat steps (3)..(5) forever ;-)

1. https://github.com/felipec/git-remote-hg

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

[git-users] Using git in an unusual way, need advice

[rhkramer]

I am probably using git in an unusual way.

I want to do some development for a project that is managed by Mercurial 
(scite / scintilla), but, for the sake of learning git (and minimizing the 
need to learn anything else)  I want to use git for the work I do.

I've downloaded the source code as tarballs (which are available--I could also 
have downloaded the source code using Mercurial, but, as long as the tarballs 
are available, I'd prefer to do it using tarballs).

I originally downloaded version 3.66 of the source code, untarred it into a 
working directory, initialized a git repository, and then added and committed 
the source code to the git repository.

So far, I haven't actually made any changes to the source code.

Now version 3.70 is available, and I sort of repeated the process, that is, I 
untarred the new version into the working directory that I had previously 
created, then did a git status--it seemed to recognize the modified files, 
which 
I then added and committed.

So far, so good.

But, I'm not sure how to handle further updates after I've made local changes 
to the source code.

The one approach I can think of is to create a patch file before I download the 
next update, then download and untar the next update, and then apply that 
patch file (while doing git adds and commits at the appropriate times, which I 
have to think about).

But the patch file approach seems rather cumbersome and un-git (and un-CMS) 
like--is there a better approach?

Thanks!

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

[git-users] Using Git as a NoSQL database

[Kenneth Truyers]

Hi all,

Recently I have been using Git as a NoSQL database.

I have written down my thoughts in a blog 
post: https://www.kenneth-truyers.net/2016/10/13/git-nosql-database/

It would be great if I could get some feedback on it.

Thanks!

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Re: [git-users] Using git log to track frequently upgraded branch

[Dale R. Worley]

Jerome Fouletier  writes:
> I have one branch BR1 which receives frequent merges from branch BR0. 
> Branch BR1 is tagged once per sprint, and I need to list the commits that 
> have been made or merged since the last tag: 
>
>
>-A1---B1(TAG)--C1---D1---E1---F1---G1(BR1)
>
>/  / /
>>
> -A0--B0C0---D0E0F1(BR0)
>>
>
> In my log, I'd want to see C1 to G1 and B0 to E0. I understand that 
> TAG..BR1 will give me C1 to G1, but how to add B0 to E0? Is it possible 
> without tagging A0?

You're going to have to *find* A0, despite the fact that it isn't
explictly tagged.  I think the definition you are using is "the last
commit on BR0 that was merged into TAG".  In that case, you can find A0
with

git merge-base BR0 TAG

Dale

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

[git-users] Using git log to track frequently upgraded branch

[Jerome Fouletier]

Hi,

I have one branch BR1 which receives frequent merges from branch BR0. 
Branch BR1 is tagged once per sprint, and I need to list the commits that 
have been made or merged since the last tag: 


   -A1---B1(TAG)--C1---D1---E1---F1---G1(BR1)

   /  / /
>
-A0--B0C0---D0E0F1(BR0)
>

In my log, I'd want to see C1 to G1 and B0 to E0. I understand that 
TAG..BR1 will give me C1 to G1, but how to add B0 to E0? Is it possible 
without tagging A0?

Thanks

Jérôme

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

[git-users] Using Git to maintain several repositories from overlapping file sets.

[RrnR]

I have the need to maintain repositories (both local and remote) where the 
working file sets are a subset of files within a folder tree, and will 
overlap -i.e. will have files in common.  As an example I might have a 
folder free:


  Folder/File  Repository
  ---
  Folder1 
FileA  Repo-1  Repo-2
FileB  Repo-1
FileC  Repo-2


Folder2
  FileDRepo-1  Repo-2


Folder3
  FileERepo-2
  
  Folder4
FileF  Repo-2


And I want Repo-1 to have FileA, FileB, FileD in its working set, and 
Repo-2 to have FileA, FileC, FileD , FileE, FileF in its working set.

Obviously the repository folders can't both be called .git and live in the 
same folder so where do they live?  How do you set this up?

Thanks
R

Windows 7/8
BitBucket

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

[git-users] Using git with test and production servers

[Freddy Trotin]

Hello,

I've got 2 DNN Servers (Test and Production)  and I would like to use git 
to manage the files on this server :

First I wan't to check that all files of these 2 servers are identical 
(They should be but I know it they are not)
Then, after correcting files so the 2 servers are identical, I would like 
to push the modifications I make
on my test server to my production server when my tests are ok.

How can I proceed these 2 steps with git ?

Do I have to  install git on each server or can I use git on my PC with 2 
distant folders ?
Can I create 2 branches (test and production) each one pointing to a 
different distant folder ?
How do I compare the 2 servers and then push one toward the other (with 
checking the differences between them)

Any help will be appreciated.

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Re: [git-users] Using git

[Yingshou Guo]

One of the simplest ways to do what you want:

1, setup a bare,shared repository in a machine: git init --bare --shared
myrepo.git
2, make it accessible through ssh protocol(setup ssh server and make an
account for every developer)
3, clone the repo: git clone ssh://@server//myrepo.git
4, you are done.


On Fri, Aug 15, 2014 at 7:22 PM, Konstantin Khomoutov <
flatw...@users.sourceforge.net> wrote:

> On Wed, 13 Aug 2014 05:09:13 -0700 (PDT)
> Akhilesh Yadav  wrote:
>
> > I am new to git. I was thinking to setup local git repository.I have
> > Centos 6.5 server where I am planning to install git.There will be 5
> > person pushing and pulling data from the git repository.I am confused
> > about it how they will push and pull data from the server.What the
> > actual process will happen to achieve this
>
> http://git-scm.com/book/en/Git-on-the-Server-Getting-Git-on-a-Server
>
> --
> You received this message because you are subscribed to the Google Groups
> "Git for human beings" group.
> To unsubscribe from this group and stop receiving emails from it, send an
> email to git-users+unsubscr...@googlegroups.com.
> For more options, visit https://groups.google.com/d/optout.
>

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Re: [git-users] Using git

[Konstantin Khomoutov]

On Wed, 13 Aug 2014 05:09:13 -0700 (PDT)
Akhilesh Yadav  wrote:

> I am new to git. I was thinking to setup local git repository.I have
> Centos 6.5 server where I am planning to install git.There will be 5
> person pushing and pulling data from the git repository.I am confused
> about it how they will push and pull data from the server.What the
> actual process will happen to achieve this 

http://git-scm.com/book/en/Git-on-the-Server-Getting-Git-on-a-Server

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

[git-users] Using git

[Akhilesh Yadav]

Hi All,

I am new to git. I was thinking to setup local git repository.I have Centos 
6.5 server where I am planning to install git.There will be 5 person 
pushing and pulling data from the git repository.I am confused about it how 
they will push and pull data from the server.What the actual process will 
happen to achieve this 

Can anyone please help or guide me in this.


Thanks

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Re: [git-users] Using git as a team - subdomains or local envs?

[Jeremy Belolo]

I may just do this. Thanks for your help !

Le mercredi 7 mai 2014 13:32:27 UTC+3, Magnus Therning a écrit :
>
> On Wed, May 7, 2014 at 11:49 AM, Jeremy Belolo 
> > 
> wrote: 
> > Hello Magnus and thanks for your answer ! 
> > 
> > I tried to be crystal clear, that's why I described all the steps I 
> did... 
> > Seems I didn't succeed. So I will start by saying I never encountered a 
> > issue with git itself. It's just the project I took that is build on a 
> very 
> > strange coding way. I can't work with it on windows. At all. (slashes 
> > issues, fonts issues, and a lot more. Don't ask; I curse the previous 
> > developper every then and now ^^) 
>
> Then you were clear, I just thought there was a git question in there 
> somewhere, and that I just didn't get it :) 
>
> Well, we are all different I suppose, I frequently curse developers 
> who write stuff that can only be developed on Windows ;) 
>
> > What I really need is just advices on how to work as a team. Not about 
> > branching and this kind of things, I got it. But about the environnment 
> to 
> > use for every developer when working on a regular project (not a messy 
> one 
> > like the last I worked on). Subdomains ? Local machine with easyPHP or 
> > another local webserver and commiting when ready for testing ? If so, 
> what 
> > about eventually needed callbacks like Paypal's ? 
>
> I can't offer much concrete advice, but requiring that developer 
> testing is run on a machine that Paypal can reach is a serious 
> limitation and runs the risk of no testing being done at all.  Is 
> there some way you can abstract away the Paypal stuff, 
> mocking/stubbing maybe?  Another, rather more heavy-weight approach 
> would be to write a Paypal gateway that those tests can tunnel 
> through, then the exposure to the internet is kept a bit smaller. 
>
> > I come to realize my questionning is not really about git but it's more 
> > about how to actually work as a team... 
>
> I'm guessing you might get more constructive feedback by turning to a 
> mailing list dedicated to web programming, or to the specific 
> framework you are using. 
>
> /M 
>
> -- 
> Magnus Therning  OpenPGP: 0xAB4DFBA4 
> email: mag...@therning.orgjabber: 
> mag...@therning.org 
> twitter: magthe   http://therning.org/magnus 
>

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Re: [git-users] Using git as a team - subdomains or local envs?

[Magnus Therning]

On Wed, May 7, 2014 at 11:49 AM, Jeremy Belolo  wrote:
> Hello Magnus and thanks for your answer !
>
> I tried to be crystal clear, that's why I described all the steps I did...
> Seems I didn't succeed. So I will start by saying I never encountered a
> issue with git itself. It's just the project I took that is build on a very
> strange coding way. I can't work with it on windows. At all. (slashes
> issues, fonts issues, and a lot more. Don't ask; I curse the previous
> developper every then and now ^^)

Then you were clear, I just thought there was a git question in there
somewhere, and that I just didn't get it :)

Well, we are all different I suppose, I frequently curse developers
who write stuff that can only be developed on Windows ;)

> What I really need is just advices on how to work as a team. Not about
> branching and this kind of things, I got it. But about the environnment to
> use for every developer when working on a regular project (not a messy one
> like the last I worked on). Subdomains ? Local machine with easyPHP or
> another local webserver and commiting when ready for testing ? If so, what
> about eventually needed callbacks like Paypal's ?

I can't offer much concrete advice, but requiring that developer
testing is run on a machine that Paypal can reach is a serious
limitation and runs the risk of no testing being done at all.  Is
there some way you can abstract away the Paypal stuff,
mocking/stubbing maybe?  Another, rather more heavy-weight approach
would be to write a Paypal gateway that those tests can tunnel
through, then the exposure to the internet is kept a bit smaller.

> I come to realize my questionning is not really about git but it's more
> about how to actually work as a team...

I'm guessing you might get more constructive feedback by turning to a
mailing list dedicated to web programming, or to the specific
framework you are using.

/M

-- 
Magnus Therning  OpenPGP: 0xAB4DFBA4
email: mag...@therning.org   jabber: mag...@therning.org
twitter: magthe   http://therning.org/magnus

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Re: [git-users] Using git as a team - subdomains or local envs?

[Jeremy Belolo]

Hello Magnus and thanks for your answer !

I tried to be crystal clear, that's why I described all the steps I did... 
Seems I didn't succeed. So I will start by saying I never encountered a 
issue with git itself. It's just the project I took that is build on a very 
strange coding way. I can't work with it on windows. At all. (slashes 
issues, fonts issues, and a lot more. Don't ask; I curse the previous 
developper every then and now ^^)

What I really need is just advices on how to work as a team. Not about 
branching and this kind of things, I got it. But about the environnment to 
use for every developer when working on a regular project (not a messy one 
like the last I worked on). Subdomains ? Local machine with easyPHP or 
another local webserver and commiting when ready for testing ? If so, what 
about eventually needed callbacks like Paypal's ?

I come to realize my questionning is not really about git but it's more 
about how to actually work as a team... 

Thanks again.

Le mercredi 7 mai 2014 07:35:28 UTC+3, Magnus Therning a écrit :
>
> On Tue, May 06, 2014 at 02:59:45PM -0700, Jeremy Belolo wrote: 
> > Hello all ! 
> > 
> > I started using git 1 year ago. At the beginning I tried to work 
> > with it on my local env on windows, and I would push the changes to 
> > the dev server when ready. But I came across countless issues. 
>
> What git issues did you come across? 
>
> > So I tried something else. Using Virtualbox to create a virtual 
> > Ubuntu that I used to work. I was able to access files and edit them 
> > on Windows, and the versionning was great. 
> > 
> > But the connectivity gave me headaches. Plus, there is a big 
> > downside, the site I was working on used Paypal IPN, which calls an 
> > arbitrary script on your server to send results of transactions. 
> > Unable to reach my local PC, or the VM, this side of things was very 
> > difficult to test. No need to say this was a huge problem. 
> > 
> > So I moved on and created a subdomain. There already was mysite.com 
> > and dev.mysite.com on the server. I added jer.mysite.com for me, 
> > dan.mysite.com for another dev, ext.mysite.com for external services 
> > working with us, and so on... Then cloned dev.mysite.com in every 
> > one of those. 
> > 
> > This works nice. Everyone got his own environnment on the server 
> > directly, every external scripts such as Paypal's or Facebook's 
> > works without any issue. We worked like this for many months now. 
> > 
> > What I'm not very satisfied about, is the concept. Working like this 
> > forces to use the main server, the production server, directly for 
> > development purpose. Not only it could be a real problem if your 
> > team grows to include 20, 30 developers, but it also cause 
> > unnecessary server load. A dev testing a consuming script could 
> > really slow down the production site... Which is not acceptable. 
> > 
> > So, what would you guys recommend ? 
>
> I am confused.  Probably I just don't understand you, but it does 
> sound like the choice of VCS is completely unrelated to your headaches 
> with connectivity.  The issue at hand is that in order to test your 
> code Paypal IPN performs a callback, and therefore needs to be able to 
> reach the machine you are running the tests on, i.e. your dev machine 
> has to be exposed to the internet in order for the tests to pass.  No? 
>
> /M 
>
> -- 
> Magnus Therning  OpenPGP: 0xAB4DFBA4 
> email: mag...@therning.orgjabber: 
> mag...@therning.org 
> twitter: magthe   http://therning.org/magnus 
>
> Goto labels should be left-aligned in all caps and should include the 
> programmer's name, home phone number, and credit card number. 
>  -- Abdul Nizar 
>

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Re: [git-users] Using git as a team - subdomains or local envs?

[Magnus Therning]

On Tue, May 06, 2014 at 02:59:45PM -0700, Jeremy Belolo wrote:
> Hello all !
> 
> I started using git 1 year ago. At the beginning I tried to work
> with it on my local env on windows, and I would push the changes to
> the dev server when ready. But I came across countless issues.

What git issues did you come across?

> So I tried something else. Using Virtualbox to create a virtual
> Ubuntu that I used to work. I was able to access files and edit them
> on Windows, and the versionning was great.
> 
> But the connectivity gave me headaches. Plus, there is a big
> downside, the site I was working on used Paypal IPN, which calls an
> arbitrary script on your server to send results of transactions.
> Unable to reach my local PC, or the VM, this side of things was very
> difficult to test. No need to say this was a huge problem.
> 
> So I moved on and created a subdomain. There already was mysite.com
> and dev.mysite.com on the server. I added jer.mysite.com for me,
> dan.mysite.com for another dev, ext.mysite.com for external services
> working with us, and so on... Then cloned dev.mysite.com in every
> one of those.
> 
> This works nice. Everyone got his own environnment on the server
> directly, every external scripts such as Paypal's or Facebook's
> works without any issue. We worked like this for many months now.
> 
> What I'm not very satisfied about, is the concept. Working like this
> forces to use the main server, the production server, directly for
> development purpose. Not only it could be a real problem if your
> team grows to include 20, 30 developers, but it also cause
> unnecessary server load. A dev testing a consuming script could
> really slow down the production site... Which is not acceptable.
> 
> So, what would you guys recommend ?

I am confused.  Probably I just don't understand you, but it does
sound like the choice of VCS is completely unrelated to your headaches
with connectivity.  The issue at hand is that in order to test your
code Paypal IPN performs a callback, and therefore needs to be able to
reach the machine you are running the tests on, i.e. your dev machine
has to be exposed to the internet in order for the tests to pass.  No?

/M

-- 
Magnus Therning  OpenPGP: 0xAB4DFBA4 
email: mag...@therning.org   jabber: mag...@therning.org
twitter: magthe   http://therning.org/magnus

Goto labels should be left-aligned in all caps and should include the
programmer's name, home phone number, and credit card number.
 -- Abdul Nizar


pgp6JAmvJXzDG.pgp
Description: PGP signature

[git-users] Using git as a team - subdomains or local envs?

[Jeremy Belolo]

Hello all !

I started using git 1 year ago. At the beginning I tried to work with it on 
my local env on windows, and I would push the changes to the dev server 
when ready. But I came across countless issues.

So I tried something else. Using Virtualbox to create a virtual Ubuntu that 
I used to work. I was able to access files and edit them on Windows, and 
the versionning was great.

But the connectivity gave me headaches. Plus, there is a big downside, the 
site I was working on used Paypal IPN, which calls an arbitrary script on 
your server to send results of transactions. Unable to reach my local PC, 
or the VM, this side of things was very difficult to test. No need to say 
this was a huge problem.

So I moved on and created a subdomain. There already was mysite.com and 
dev.mysite.com on the server. I added jer.mysite.com for me, dan.mysite.com 
for another dev, ext.mysite.com for external services working with us, and 
so on... Then cloned dev.mysite.com in every one of those.

This works nice. Everyone got his own environnment on the server directly, 
every external scripts such as Paypal's or Facebook's works without any 
issue. We worked like this for many months now.

What I'm not very satisfied about, is the concept. Working like this forces 
to use the main server, the production server, directly for development 
purpose. Not only it could be a real problem if your team grows to include 
20, 30 developers, but it also cause unnecessary server load. A dev testing 
a consuming script could really slow down the production site... Which is 
not acceptable.

So, what would you guys recommend ?

Thanks ahead !

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Re: [git-users] Using git for multiple projects

[Magnus Therning]

On Tue, Apr 08, 2014 at 04:43:29PM -0400, Maurizio Vitale wrote:
> I've never used multiple git repositories in large scale
> multi-committer projects (the closest is a new language frontend for
> llvm that uses submodules for beinging in clang and llvm, but I'm
> the only committer).
> 
> I see people advocating splitting large code bases into multiple git
> repository and then using one of the mechanisms suggested in this
> thread to 'federate' the different repositories.
> How do people handle atomicity of commits that span multiple
> repositories (e.g a library and its clients)?
> How do you review CLs spanning multiple repositories?
> Are those problems only theoretical and don't happen in practice?

Well, the question you need to ask yourself is if you REALLY need
atomicity of commits against different projects/repos!

I'd say it depends on how you structure your work.  If projects are
loosely coupled, and released (semi-)independently then maybe just
maintaining a record of what set of versions of each project work
together is enough.  That is, you here glide away from VCS, Version
Control system, to CMS, Configuration Management System.

In the places I've worked where multiple repos has been used to build
a single product this tracking was tied to the continuous integration
system.   Where changes were required both in libs and applications
(or both client and server) this was tracked via a bug tracker, simply
because the organisation was so big that it very rarely was the same
developer implementing both sides.  The teams were in charge of their
own planning so it would have been neigh impossible to get the
implementations of both sides into the same changeset anyway.

/M

-- 
Magnus Therning  OpenPGP: 0xAB4DFBA4 
email: mag...@therning.org   jabber: mag...@therning.org
twitter: magthe   http://therning.org/magnus

Perl is another example of filling a tiny, short-term need, and then
being a real problem in the longer term.
 -- Alan Kay


pgpawRoD9THio.pgp
Description: PGP signature

Re: [git-users] Using git for multiple projects

[Maurizio Vitale]

I've never used multiple git repositories in large scale multi-committer
projects (the closest is a new language frontend for llvm that uses
submodules for beinging in clang and llvm, but I'm the only committer).

I see people advocating splitting large code bases into multiple git
repository and then using one of the mechanisms suggested in this thread to
'federate' the different repositories.
How do people handle atomicity of commits that span multiple repositories
(e.g a library and its clients)?
How do you review CLs spanning multiple repositories?
Are those problems only theoretical and don't happen in practice?


On Fri, Apr 4, 2014 at 2:40 PM, Magnus Therning  wrote:

> On Fri, Apr 04, 2014 at 10:09:08AM -0700, Thomas Beardshear wrote:
> > Anyone have any suggestions for using git for multiple projects?
> >
> > The concept of git seems clear for one large project, but when your
> applets
> > are in multiple locations (departments vs server functions vs cloud-based
> > vendor integrations), it gets a little vague especially for people that
> use
> > it periodically.
> >
> > I used to simply ZIP each folder(collection of scripts/applets/programs),
> > move the ZIP file to a backup folder, then modify a file.  Works great
> but
> > I'm zipping ALL files instead of just the ones that changed.
> >
> > This works great for multiple projects, multiple storage locations,
> etc...
> >
> > Now it's time to put it all together:
> >
> > Multiple Storage Locations:
> >
> > Here is a typical setup (with a SUBSET of folders and projects)
> > Notice the UNRELATED folders.  When I use GIT, it reports that they are
> > unmonitored - when is perfectly fine that they are, but disturbing that
> > they are listed as unmonitored, not to mention screen-cluttery...
> >
> > What "concepts" in git should be used to manage the different
> > server/department project folders/subfolders?
> >
> > Branches are designed (as I understand it) to test code and maintain
> > versions.  But these are unrelated PROJECTS.
> >
> > Should I use a different GIT file for each server/department/vendor?
> > Is there another "structure management" feature that I'm missing?
>
> git submodules : http://www.git-scm.com/book/en/Git-Tools-Submodules
> git subtree :
> https://github.com/git/git/blob/master/contrib/subtree/git-subtree.txt
> git-repo : https://code.google.com/p/git-repo/
> myrepos : http://myrepos.branchable.com/
>
> There are numerous options, if I understand your question.
>
> /M
>
> --
> Magnus Therning  OpenPGP: 0xAB4DFBA4
> email: mag...@therning.org   jabber: mag...@therning.org
> twitter: magthe   http://therning.org/magnus
>
> Most software today is very much like an Egyptian pyramid with
> millions of bricks piled on top of each other, with no structural
> integrity, but just done by brute force and thousands of slaves.
>  -- Alan Kay
>

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Re: [git-users] Using git for multiple projects

[Magnus Therning]

On Fri, Apr 04, 2014 at 10:09:08AM -0700, Thomas Beardshear wrote:
> Anyone have any suggestions for using git for multiple projects?
> 
> The concept of git seems clear for one large project, but when your applets 
> are in multiple locations (departments vs server functions vs cloud-based 
> vendor integrations), it gets a little vague especially for people that use 
> it periodically.
> 
> I used to simply ZIP each folder(collection of scripts/applets/programs), 
> move the ZIP file to a backup folder, then modify a file.  Works great but 
> I'm zipping ALL files instead of just the ones that changed.
> 
> This works great for multiple projects, multiple storage locations, etc...
> 
> Now it's time to put it all together:
> 
> Multiple Storage Locations:
> 
> Here is a typical setup (with a SUBSET of folders and projects)
> Notice the UNRELATED folders.  When I use GIT, it reports that they are 
> unmonitored - when is perfectly fine that they are, but disturbing that 
> they are listed as unmonitored, not to mention screen-cluttery...
> 
> What "concepts" in git should be used to manage the different 
> server/department project folders/subfolders?  
> 
> Branches are designed (as I understand it) to test code and maintain 
> versions.  But these are unrelated PROJECTS.
> 
> Should I use a different GIT file for each server/department/vendor?
> Is there another "structure management" feature that I'm missing?

git submodules : http://www.git-scm.com/book/en/Git-Tools-Submodules
git subtree : 
https://github.com/git/git/blob/master/contrib/subtree/git-subtree.txt
git-repo : https://code.google.com/p/git-repo/
myrepos : http://myrepos.branchable.com/

There are numerous options, if I understand your question.

/M

-- 
Magnus Therning  OpenPGP: 0xAB4DFBA4 
email: mag...@therning.org   jabber: mag...@therning.org
twitter: magthe   http://therning.org/magnus

Most software today is very much like an Egyptian pyramid with
millions of bricks piled on top of each other, with no structural
integrity, but just done by brute force and thousands of slaves.
 -- Alan Kay


pgpewSYTmVac3.pgp
Description: PGP signature

[git-users] Using git for multiple projects

[Thomas Beardshear]

Anyone have any suggestions for using git for multiple projects?

The concept of git seems clear for one large project, but when your applets 
are in multiple locations (departments vs server functions vs cloud-based 
vendor integrations), it gets a little vague especially for people that use 
it periodically.

I used to simply ZIP each folder(collection of scripts/applets/programs), 
move the ZIP file to a backup folder, then modify a file.  Works great but 
I'm zipping ALL files instead of just the ones that changed.

This works great for multiple projects, multiple storage locations, etc...

Now it's time to put it all together:

Multiple Storage Locations:

Here is a typical setup (with a SUBSET of folders and projects)
Notice the UNRELATED folders.  When I use GIT, it reports that they are 
unmonitored - when is perfectly fine that they are, but disturbing that 
they are listed as unmonitored, not to mention screen-cluttery...

What "concepts" in git should be used to manage the different 
server/department project folders/subfolders?  

Branches are designed (as I understand it) to test code and maintain 
versions.  But these are unrelated PROJECTS.

Should I use a different GIT file for each server/department/vendor?
Is there another "structure management" feature that I'm missing?

\\server\dept1\projects
\\server\dept1\projects\project1
\\server\dept1\projects\project2
\\server\dept1\UnrelatedFolder1
\\server\dept1\UnrelatedFolder2
\\server\dept1\UnrelatedFolder3
\\server\dept1\UnrelatedFolder4

\\server\dept2\projects
\\server\dept2\projects\project1
\\server\dept2\projects\project2
\\server\dept2\UnrelatedFolder1
\\server\dept2\UnrelatedFolder2
\\server\dept2\UnrelatedFolder3
\\server\dept2\UnrelatedFolder4

\\server\dept3\projects
\\server\dept3\projects\project1
\\server\dept3\projects\project2
\\server\dept3\projects\project3
\\server\dept3\projects\project4
\\server\dept3\UnrelatedFolder1
\\server\dept3\UnrelatedFolder2
\\server\dept3\UnrelatedFolder3
\\server\dept3\UnrelatedFolder4

\\server\server1\projects
\\server\server1\projects\project1
\\server\server1\projects\project2
\\server\server1\projects\project3
\\server\server1\projects\project4
\\server\srever1\UnrelatedFolder1
\\server\server1\UnrelatedFolder2
\\server\server1\UnrelatedFolder3
\\server\server1\UnrelatedFolder4

\\server\server2\projects
\\server\server2\projects\project1
\\server\server2\projects\project2
\\server\server2\projects\project3
\\server\server2\projects\project4
\\server\srever2\UnrelatedFolder1
\\server\server2\UnrelatedFolder2
\\server\server2\UnrelatedFolder3
\\server\server2\UnrelatedFolder4

\\server\server3\projects
\\server\server3\projects\project1
\\server\server3\projects\project2
\\server\server3\projects\project3
\\server\server3\projects\project4
\\server\srever3\UnrelatedFolder1
\\server\server3\UnrelatedFolder2
\\server\server3\UnrelatedFolder3
\\server\server3\UnrelatedFolder4

yada
yada
(no third yada is necessary here...)



-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Re: [git-users] using GIT as library from an own C program

[Konstantin Khomoutov]

On Tue, 18 Feb 2014 09:27:43 -0800 (PST)
mareb  wrote:

> > Note that the Git developers perceive Git itself as being *a
> > library* 
> > -- not in the sense of it being a .so file with exported API but in
> > an "older" sense of presenting you with a collection of low-levels
> > sharp tools to call.  All executable files comprising Git are split
> > in two layers--"porcelain" and "plumbing"--with the former being
> > for interactive using and the latter--for usage by other programs.
> > So the programs in the plumbing layer have stable output formats
> > (or support special knobs allowing them to be tailored for the
> > needs of the calling program).  Projects like ikiwiki or gitolite
> > do exactly this and do not rely on a third-party library. 
> >
> Hello Konstantin,
> I did not saw, how to use the Git programs in a "low-level way". The
> Perl projects ikiwiki and gitolite does not help me, to understand,
> how to use the git programs with my C source.

That has nothing to do with Git or Perl, actually: you're supposed to
use whatever is made available by your compiler/libraries/runtime to
run a process and communicate with it using its standard input and
output streams (and exit code).  With plain C it's popen() or a
combination of fork(), exec() and pipe() (that's for POSIX; on other
platforms like Windows you're supposed to use their respective APIs).

If you're doing hardcore C (that is, not assisted with general-purpose
libraries like glib or libapr) you're expected to code the interaction
by hand.  Git does exactly this internally--you could start from reading
the start_command() function in run-command.c and, say, submodule.c for
an example of its usage (actually, running `git grep -Fw start_command`
on the Git's source code checkout yields tons of examples).
If you're using a general-purpose system abstraction library then it
usually comes equipped with the stuff necessary to spawn a process and
communicate with it.

I understand that doing this in C is hard, but doing everything in C is
hard.

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.

Re: [git-users] using GIT as library from an own C program

[mareb]

Hello Konstantin,
I did not saw, how to use the Git programs in a "low-level way". The Perl 
projects ikiwiki and gitolite does not help me, to understand, how to use 
the git programs with my C source.

Thank you


Am Sonntag, 16. Februar 2014 16:39:28 UTC+1 schrieb Konstantin Khomoutov:
>
> On Fri, 14 Feb 2014 20:16:31 -0800 (PST) 
> mareb > wrote: 
>
> > that is great! Thank you very much! 
> > This library seems to be, what I look for. 
>
> Note that the Git developers perceive Git itself as being *a library* 
> -- not in the sense of it being a .so file with exported API but in an 
> "older" sense of presenting you with a collection of low-levels sharp 
> tools to call.  All executable files comprising Git are split in two 
> layers--"porcelain" and "plumbing"--with the former being for 
> interactive using and the latter--for usage by other programs. So the 
> programs in the plumbing layer have stable output formats (or support 
> special knobs allowing them to be tailored for the needs of the calling 
> program).  Projects like ikiwiki or gitolite do exactly this and do not 
> rely on a third-party library. 
>

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.

Re: [git-users] using GIT as library from an own C program

[Konstantin Khomoutov]

On Fri, 14 Feb 2014 20:16:31 -0800 (PST)
mareb  wrote:

> that is great! Thank you very much!
> This library seems to be, what I look for.

Note that the Git developers perceive Git itself as being *a library*
-- not in the sense of it being a .so file with exported API but in an
"older" sense of presenting you with a collection of low-levels sharp
tools to call.  All executable files comprising Git are split in two
layers--"porcelain" and "plumbing"--with the former being for
interactive using and the latter--for usage by other programs. So the
programs in the plumbing layer have stable output formats (or support
special knobs allowing them to be tailored for the needs of the calling
program).  Projects like ikiwiki or gitolite do exactly this and do not
rely on a third-party library.

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.

Re: [git-users] using GIT as library from an own C program

[mareb]

Hey,
that is great! Thank you very much!
This library seems to be, what I look for.



Am Samstag, 15. Februar 2014 01:35:55 UTC+1 schrieb Thomas Ferris 
Nicolaisen:
>
>
>
> On Saturday, February 15, 2014 1:00:32 AM UTC+1, Gergely Polonkai wrote:
>>
>> Hello,
>>
>> there is a project called libgit (maybe libgit2?). However, it is not 
>> part of Git, it is totally independent (from development's view).
>>
>>
> Yup, more specifically: http://libgit2.github.com/ - the license is GPL 
> with linking allowed to closed-source things. 
>

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.

Re: [git-users] using GIT as library from an own C program

[Thomas Ferris Nicolaisen]

On Saturday, February 15, 2014 1:00:32 AM UTC+1, Gergely Polonkai wrote:
>
> Hello,
>
> there is a project called libgit (maybe libgit2?). However, it is not part 
> of Git, it is totally independent (from development's view).
>
>
Yup, more specifically: http://libgit2.github.com/ - the license is GPL 
with linking allowed to closed-source things. 

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.

Re: [git-users] using GIT as library from an own C program

[Gergely Polonkai]

Hello,

there is a project called libgit (maybe libgit2?). However, it is not part
of Git, it is totally independent (from development's view).

Cheers,
Gergely


On 14 February 2014 21:27, mareb  wrote:

> Hello,
> is it possible to use a git library? I found no lib on my debian system.
>
> Does someone know, if it is possible to include GIT source as part of my
> program (GPL 2 too)?
>
>  --
> You received this message because you are subscribed to the Google Groups
> "Git for human beings" group.
> To unsubscribe from this group and stop receiving emails from it, send an
> email to git-users+unsubscr...@googlegroups.com.
> For more options, visit https://groups.google.com/groups/opt_out.
>

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.

[git-users] using GIT as library from an own C program

[mareb]

Hello,
is it possible to use a git library? I found no lib on my debian system.

Does someone know, if it is possible to include GIT source as part of my 
program (GPL 2 too)? 

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.

Re: [git-users] Using Git as a user documentation source file repository

[Konstantin Khomoutov]

On Wed, 4 Sep 2013 21:17:39 +0400
Konstantin Khomoutov  wrote:

> > My organization is thinking about Git as a repository for FM+SMGL
> > source (binary) files. We have very minimal requirements:
> > 
> > * ability to check in / check out multiple files at the same time
> 
> Yes.

After re-reading your question with a fresher state of mind, I now
think you might be confused about how DVCS works, and so you might
either reconsider your intention to use a system of this class or
adjust your expectations about it.

A hallmark property of a DVCS is that each repository has the complete
history with all the commits comprising it.  This means commits
(recording new revisions) only ever happen in the repository itself,
and each commit captures a complete state of the project.  This means,
you can't really "check out" several files "from" a DVCS (to some
place), edit them and then "check them in", making a DVCS record a
synthetic commit based on these files only and everything else.

This kind of thing is doable with Subversion, for instance, where you
are able to check out just a single directory out of the whole project
and commit just a single file, making the server synthesize a commit
representing a full project state no one yet have seen locally.

In Git, you can normally (but see below) only check out a single branch
(or a specific commit), and this action does two things:

* The work tree -- a place where the checked out files are stored, and
  where you modify them -- is populated by the state of the *whole*
  project as recorded in the commit being checked out.
* The staging area -- a special place from which a commit is made -- is
  populated with the state of files checked out into the work tree.

That is, normally your work tree has the entire project checked out,
and that's how Git works.

Now there's a special Git feature called "sparse checkouts" [1] -- when
enabled for a repository, it allows you to only check out an explicitly
configured set of directories to not waste the space under the work
tree.  There seems to be no way to only check out specific sets of
separate files using this feature though.

[...]

1. http://briancoyner.github.io/blog/2013/06/05/git-sparse-checkout/

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.

[git-users] Using Git as a user documentation source file repository

[Chris Bridgen]

Hi
My organization is thinking about Git as a repository for FM+SMGL source 
(binary) files. We have very minimal requirements:

* ability to check in / check out multiple files at the same time

* ability to download entire sets of files to another server

* ability to restrict some user's ability to create new branches/folders

Anyone with experience using Git for a doc source file environment, looking 
for any and all advice you have.

Thanks!

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.

Re: [git-users] Using Git as a user documentation source file repository

[Konstantin Khomoutov]

On Wed, 4 Sep 2013 09:55:05 -0700 (PDT)
Chris Bridgen  wrote:

> My organization is thinking about Git as a repository for FM+SMGL
> source (binary) files. We have very minimal requirements:
> 
> * ability to check in / check out multiple files at the same time

Yes.

> * ability to download entire sets of files to another server

No.  You can only transfer objects from one Git repository to another.
The granularity of this history is a single branch or a tag.  You can
transfer arbitrary number of them at a time though, and the transfers
are incremental, of course, -- only the information which is missing in
the receiving repository is transferred.  But Git does not offer any
notion of a file (or a directory) in its native protocols.

On the other hand, if "to another server" is OK to mean "to a Git
repository on another server" then the answer is yes.  The receiving
repo can then be accessed with the usual Git commands to extract
arbitrary files from it.

Another alternative which might be applicable is the `git archive`
command which can be used to produce an archive file containing the
snapshot of the selected repository state.

> * ability to restrict some user's ability to create new
> branches/folders

No with plain Git.  On the other hand, front-ends exist which implement
ACLs with this granularity. gitolite and gitosis are popular choices
(with the former one appearing to be a very popular pick these days).

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.

Re: [git-users] Using 'git' name legally ok?

[Konstantin Khomoutov]

On Mon, 13 May 2013 08:15:32 -0700 (PDT)
Troy Murray  wrote:

> I realize this is probably a strange question, but my employer wants
> to make sure we can freely use the 'git' name in our documentation
> and even our internal git.server.org DNS structure without risk of
> legal problems. I'm not sure who to contact for this "officially" as
> there isn't an email address on the project page, other then the
> mailing list.  Does anyone have any suggestions?

That mailing list (git at vger.kernel.org) is indeed the "official"
place to ask.  But really I doubt you will get any *definitive* answer
even there for the simple reason: no one cares.  Some F/OSS projects
strive to protect them from abuse (recall the recent claim from some
european firm it has the right to use the word "Python" for its
projects, and hence the Python foundation should rename its stuff and
surrender using their python.org domain etc; luckily those morons
failed).  I mean, no one is realistically going to sue your organisation
for just using those names -- no matter whether in the internal docs or
for naming subdomains.  The only concievable reason for which a legal
action could be taken against your enterprise is when it somehow
decided to *claim* it has some *exclusive* rights to use the name "Git"
for the products it sells etc.

Also let's looks at the issue from an extreme layman's point of view:
if using things like this wasn't possible then online technical media
could not exist at all as every article they post is ripe with
names of products (trademarked or not).
If really in doubt, I think you could add a footer to each piece of your
documentation stating something like "the names of the software
products mentioned in this documentation might be trade marks of their
respective owners".

The last point: Git is a member of the "Free Software Concervancy"
not-for-profit organisation, and the latter has contacts [1], which, I
think, you could use to ask them your question.

1. http://sfconservancy.org/about/contact/

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.

[git-users] Using 'git' name legally ok?

[Troy Murray]

I realize this is probably a strange question, but my employer wants to 
make sure we can freely use the 'git' name in our documentation and even 
our internal git.server.org DNS structure without risk of legal problems. 
 I'm not sure who to contact for this "officially" as there isn't an email 
address on the project page, other then the mailing list.  Does anyone have 
any suggestions?

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.

Re: [git-users] Using Git to track system file customizations

[Bryce Verdier]

On 03/28/2013 11:33 AM, John McKown wrote:
I do that, partially at least. I track the files in /etc. But I 
generally only do it after I do a yum upgrade. All I do is:


cd /etc
sudo git init #well, only the first time
sudo git add -A .
sudo git commit -m "commit message"

You could just get in the habit of doing the last two every time you 
modify anything in the /etc subdirectory hierarchy.


I also do multi-machine tracking. Similar to:

#logon to git global repository machine as root
cd /global/repositories/git
git init --bare configurations.git

On each machine do the following as root

#to start up:
cd /etc
git init
git remote add origin 
ssh://user@global/global/repositories/git/configurations.git

git checkout -b $(hostname)
git add -A .
git commit -m "commit message"
git push --all
git remote set-branches --add origin other-host-1 other-host-2 ...
git fetch



When I want to compare two machine, I log on to one and do:

cd /etc
git fetch
git diff HEAD other-host

Where "other-host" is the branch name (hostname) of the second host. I 
often use the --stat for a smaller output if I only want to know the 
names of the differing files and not the actual differences.


If you have multiple hosts, you can do all the compares on a given 
host by doing the "git fetch" and then do:


git diff host1 host2

because the branch name for the files on host1 is host1 and is host2 
for host2.


When you set up another host, you will need to do the above, then do a 
"git remote set-branches --add origin new-host" on every other host so 
that a "git fetch" on those hosts will pick up the new host.


Oh, I you only want to do the compares on a specific host, then you 
can do the "get remote set-branches" just on that specific host.


Don't know if this is of any help to you or not. I hope it made some 
sense.




On Thu, Mar 28, 2013 at 12:22 PM, Dale R. Worley > wrote:


I'm considering using Git to track the customizations I make to the
system files of my Linux box.  Has anyone done that and has hints on
how to make it work well?

Actually, I have two Linux boxes, and I need to track both sets of
customizations.  It looks easy enough to have one repository on each,
and each has a tracking branch for the other repository.  But I'm not
clear on how to do the bookkeeping for cross-merging customizations
that are first inserted on one machine to the other.  I have a feeling
that I want something that tracks which deltas from one lineage have
been merged into the other lineage, along the lines of the bookkeeping
that "svn merge" does.

Dale

Dale Worley
--
Morning amnesia -- Nature's way of keeping you from waking up
screaming.
-- "Dilbert"

--
You received this message because you are subscribed to the Google
Groups "Git for human beings" group.
To unsubscribe from this group and stop receiving emails from it,
send an email to git-users+unsubscr...@googlegroups.com
.
For more options, visit https://groups.google.com/groups/opt_out.





--
This is a test of the Emergency Broadcast System. If this had been an 
actual emergency, do you really think we'd stick around to tell you?


Maranatha! <><
John McKown
--
You received this message because you are subscribed to the Google 
Groups "Git for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send 
an email to git-users+unsubscr...@googlegroups.com.

For more options, visit https://groups.google.com/groups/opt_out.



There is also this project on github:
https://github.com/bup/bup

I haven't used it, but it looks like it has some promise.

Bryce


--
You received this message because you are subscribed to the Google Groups "Git for 
human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.

Re: [git-users] Using Git to track system file customizations

[John McKown]

I do that, partially at least. I track the files in /etc. But I generally
only do it after I do a yum upgrade. All I do is:

cd /etc
sudo git init #well, only the first time
sudo git add -A .
sudo git commit -m "commit message"

You could just get in the habit of doing the last two every time you modify
anything in the /etc subdirectory hierarchy.

I also do multi-machine tracking. Similar to:

#logon to git global repository machine as root
cd /global/repositories/git
git init --bare configurations.git

On each machine do the following as root

#to start up:
cd /etc
git init
git remote add origin ssh://user@global
/global/repositories/git/configurations.git
git checkout -b $(hostname)
git add -A .
git commit -m "commit message"
git push --all
git remote set-branches --add origin other-host-1 other-host-2 ...
git fetch



When I want to compare two machine, I log on to one and do:

cd /etc
git fetch
git diff HEAD other-host

Where "other-host" is the branch name (hostname) of the second host. I
often use the --stat for a smaller output if I only want to know the names
of the differing files and not the actual differences.

If you have multiple hosts, you can do all the compares on a given host by
doing the "git fetch" and then do:

git diff host1 host2

because the branch name for the files on host1 is host1 and is host2 for
host2.

When you set up another host, you will need to do the above, then do a "git
remote set-branches --add origin new-host" on every other host so that a
"git fetch" on those hosts will pick up the new host.

Oh, I you only want to do the compares on a specific host, then you can do
the "get remote set-branches" just on that specific host.

Don't know if this is of any help to you or not. I hope it made some sense.



On Thu, Mar 28, 2013 at 12:22 PM, Dale R. Worley wrote:

> I'm considering using Git to track the customizations I make to the
> system files of my Linux box.  Has anyone done that and has hints on
> how to make it work well?
>
> Actually, I have two Linux boxes, and I need to track both sets of
> customizations.  It looks easy enough to have one repository on each,
> and each has a tracking branch for the other repository.  But I'm not
> clear on how to do the bookkeeping for cross-merging customizations
> that are first inserted on one machine to the other.  I have a feeling
> that I want something that tracks which deltas from one lineage have
> been merged into the other lineage, along the lines of the bookkeeping
> that "svn merge" does.
>
> Dale
>
> Dale Worley
> --
> Morning amnesia -- Nature's way of keeping you from waking up screaming.
> -- "Dilbert"
>
> --
> You received this message because you are subscribed to the Google Groups
> "Git for human beings" group.
> To unsubscribe from this group and stop receiving emails from it, send an
> email to git-users+unsubscr...@googlegroups.com.
> For more options, visit https://groups.google.com/groups/opt_out.
>
>
>


-- 
This is a test of the Emergency Broadcast System. If this had been an
actual emergency, do you really think we'd stick around to tell you?

Maranatha! <><
John McKown

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.

[git-users] Using Git to track system file customizations

[Dale R. Worley]

I'm considering using Git to track the customizations I make to the
system files of my Linux box.  Has anyone done that and has hints on
how to make it work well?

Actually, I have two Linux boxes, and I need to track both sets of
customizations.  It looks easy enough to have one repository on each,
and each has a tracking branch for the other repository.  But I'm not
clear on how to do the bookkeeping for cross-merging customizations
that are first inserted on one machine to the other.  I have a feeling
that I want something that tracks which deltas from one lineage have
been merged into the other lineage, along the lines of the bookkeeping
that "svn merge" does.

Dale

Dale Worley
--
Morning amnesia -- Nature's way of keeping you from waking up screaming.
-- "Dilbert"

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.

Re: [git-users] Using git in "multi-branch" project

[Dale R. Worley]

> From: Vasiliy Tzukanov 
> 
> We need to figure out how can we manage few very similar projects in 
> parallel, without having to manually enforce their coherency.

I'd suggest that you determine that you want to have a single code
base from which an array of similar artifacts will be built.  That's
messy to think about, but it is the reality you face.  If you consider
it to be a collection of similar projects, the projects will gradually
diverge until there is very little overlap between them.

Dale

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.

[git-users] Using git in "multi-branch" project

[Vasiliy Tzukanov]

Hi guys,
We are using git routinely in our project to allow collaboration of 
employees from all around the world. Until now, we supported just a single 
client, but there are new clients for our project now, each having slightly 
different requests. 
We need to figure out how can we manage few very similar projects in 
parallel, without having to manually enforce their coherency. We though of 
something like this:

   - A contributer chooses a branch to work on. 
   - When the work is done the contributer has two choices: 
  - To apply the changes to the branch he chose to work on - in this 
  case the procedure is identical to our current flow 
  - To apply the changes to all the branches - in this case the 
  contributer will be asked to resolve merge conflicts for each branch 
  independently 
   
My questions are:

   - Is this seems a reasonable approach? 
   - Is there a way to achieve this behavior with standart set of Git 
   command? 
   - Any other suggestions/comments are more than welcome.

Thanks
Vasiliy

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.

[git-users] Using Git Notes inside Gerrit Hooks

[krishna chaitanya kurnala]

Hello 

I am trying to come up with a hook that would parse the commit message of 
any change that is Approved/Merged in Gerrit and add a portion of the 
commit message to git notes.
I added a snippet to change-merged gerrit hook, for example, 
git fetch origin +refs/notes/*:refs/notes/* >> $hook_logfile

I get single entry "exit status 128" in the log file.

Does git notes need a valid workspace to execute ? Did anyone try using git 
notes inside gerrit hooks. kindly advise. i really appeciate any 
insights/guidance.

thanks
Krishna

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.

Re: [git-users] Using GIT with multiple similar websites

[Konstantin Khomoutov]

On Tue, 13 Nov 2012 07:21:51 -0800 (PST)
Ugo  wrote:

> That's one of the ideas I came up in the first place, but sadly not 
> possible.
> The code has to change a little bit for each website, i.e : a payment 
> processor for example, a different module, etc...
> It's not 100% exactly the same website, it's just that they share the
> same code base.

Have one "upstream" branch, which has magento unmodified (or modified
by incorporating changes relevant for all the sites), then fork one
branch per each site off that upstream branch.  Customize the code in
whatever way you wish on each of these branches.

The next time a new version of magento comes out you check out the
upstream branch, roll out the new release, commit, then check out each
of the "downstream" branches in turn and merge that upstream branch.
A similar procedure is carried out if you fix a bug in the common code
(thus modifying the upstream branch).

-- 

Re: [git-users] Using GIT with multiple similar websites

[Ugo]

Hello Les, 

Thanks for your answer.

That's one of the ideas I came up in the first place, but sadly not 
possible.
The code has to change a little bit for each website, i.e : a payment 
processor for example, a different module, etc...
It's not 100% exactly the same website, it's just that they share the same 
code base.

Thanks,

Ugo

Le mardi 13 novembre 2012 14:40:01 UTC+1, Les Nightingill a écrit :
>
> The way I have handled this is to have the app configurable with a "theme" 
> concept. So the way the app appears depends on a variable that is on the 
> server of the particular instance. This way I have a single codebase that 
> looks different depending on what server it's running from. 
>
> Will this work for you? 
>
> Les 
>
> On Nov 13, 2012, at 3:38 AM, Ugo wrote: 
>
> > Hello, 
> > 
> > I'm currently running multiple websites on Magento for a worldwide 
> company. At first it was only an US version and then an EU version, but now 
> we're going to open one website per distributor. 
> > Basically, there could be 8 or 10 Magento websites running in the long 
> run. 
> > 
> > The thing is that each distributor wants to change a few little details. 
> Basically the core is the same, but there could be one extra module (a 
> payment provider), or a few line of codes different from one website to 
> another. 
> > 
> > I need to manage this correctly, because it won't work otherwise and 
> take too much time. 
> > 
> > Do you have idea on what's the best use with GIT for my case ? 
> > Should I do a fork on the main master ? create a branch for each 
> distributor ? 
> > 
> > How can I manage update from the master, and spread them to each 
> distributor website ? 
> > i.e : updating the core of Magento (lots of files). 
> > 
> > Any idea/tips would be greatly appreciated. 
> > 
> > Thanks a lot, 
> > 
> > Ugo 
> > 
> > -- 
> >   
> >   
>
>

-- 

Re: [git-users] Using GIT with multiple similar websites

[Les Nightingill]

The way I have handled this is to have the app configurable with a "theme" 
concept. So the way the app appears depends on a variable that is on the server 
of the particular instance. This way I have a single codebase that looks 
different depending on what server it's running from.

Will this work for you?

Les

On Nov 13, 2012, at 3:38 AM, Ugo wrote:

> Hello, 
> 
> I'm currently running multiple websites on Magento for a worldwide company. 
> At first it was only an US version and then an EU version, but now we're 
> going to open one website per distributor.
> Basically, there could be 8 or 10 Magento websites running in the long run.
> 
> The thing is that each distributor wants to change a few little details. 
> Basically the core is the same, but there could be one extra module (a 
> payment provider), or a few line of codes different from one website to 
> another.
> 
> I need to manage this correctly, because it won't work otherwise and take too 
> much time.
> 
> Do you have idea on what's the best use with GIT for my case ?
> Should I do a fork on the main master ? create a branch for each distributor ?
> 
> How can I manage update from the master, and spread them to each distributor 
> website ?
> i.e : updating the core of Magento (lots of files).
> 
> Any idea/tips would be greatly appreciated.
> 
> Thanks a lot,
> 
> Ugo
> 
> -- 
>  
>  

-- 

[git-users] Using GIT with multiple similar websites

[Ugo]

Hello, 

I'm currently running multiple websites on Magento for a worldwide company. 
At first it was only an US version and then an EU version, but now we're 
going to open one website per distributor.
Basically, there could be 8 or 10 Magento websites running in the long run.

The thing is that each distributor wants to change a few little details. 
Basically the core is the same, but there could be one extra module (a 
payment provider), or a few line of codes different from one website to 
another.

I need to manage this correctly, because it won't work otherwise and take 
too much time.

Do you have idea on what's the best use with GIT for my case ?
Should I do a fork on the main master ? create a branch for each 
distributor ?

How can I manage update from the master, and spread them to each 
distributor website ?
i.e : updating the core of Magento (lots of files).

Any idea/tips would be greatly appreciated.

Thanks a lot,

Ugo

-- 

Re: [git-users] Using git-svn to follow a branch: detached

[Chris Stankevitz]

On Tuesday, September 25, 2012 9:00:31 PM UTC-7, Daniel P. Wright wrote:
>
> Hope that helped, and wasn't too long and rambly! 
>
>
Dani,

Thank you for your thorough explanation. I understood the theory behind 
everything you said.  I need to gain some experience with the git config 
command so that I could make changes like this on my own and actually 
understand what I am doing.

While it makes sense that I should not perform a rebase of an "svn 
following branch" that will change history of stuff that has already been 
dcommited, I'm curious about what is the technical mechanism by which this 
will be prevented, assuming it is prevented.  For example, will git say to 
me "cannot rebase -- you will be changing history of stuff you already 
dcommit to svn".  Or will it be allowed and just somehow mess up the svn 
repo.  Or will the rebase succeed but the dcommit fail.  I'm going to find 
out the answers to these using the test repos I attached in my original 
post.

Thanks again,

Chris

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

Re: [git-users] Using git-svn to follow a branch: detached

[Daniel P. Wright]

Chris Stankevitz ( 9月25日（火）) >>
> Hello,
> 
> Please consider the attached steps which create an SVN repo and setup git 
> to track it.
> 
> 1. Why do "local-newbranch" and "master" not share a common ancestor?

I think the reason is that the method you've used to add the branch to
git-svn treats that branch as a separate remote repository.  git-svn
doesn't realise it should be treating it as a branch and so doesn't try
and trace back beyond the first commit to that branch to find the
parent.

> 
> 2. How do I make them share a common ancestor?

Add the svn branches directory to the branches parameter for the
existing "svn" remote, rather than adding a new remote.  The recommended
way of doing this is to pass --branches or --stdlayout on clone/init,
but if this is impossible, you could try modifying your sequence of
steps thus:

-- >8 --
--- a/steps.txt   2012-09-26 12:09:33.331806620 +0900
+++ b/steps.txt   2012-09-26 12:08:34.383604192 +0900
@@ -23,9 +23,9 @@

 # Update the GIT repo to follow the SVN branch
 cd ${ROOT}/repo.git
-git config --add svn-remote.newbranch.url 
file://${ROOT}/repo.svn/branches/newbranch
-git config --add svn-remote.newbranch.fetch :refs/remotes/newbranch
-git svn fetch newbranch
+git config --add svn-remote.svn.branches "branches/*:refs/remotes/*"
+rm .git/svn/.metadata
+git svn fetch
 git checkout -b local-newbranch -t newbranch
 git svn rebase newbranch
 gitk --all
-- 8< --

Note the removal of the ".git/svn/.metadata" file.  When I tried it
without doing that, git-svn didn't notice the new branch settings and
didn't try to fetch the branches.  deleting this file forces git-svn to
regenerate it with the latest settings.

> 
> 3. Assuming (2) is possible, will I be able to rebase "master" changes onto 
> "local-newbranch"

You need to be careful about this, as you can't rewrite history on the
svn side.  Essentially svn has no "rebase", only "merge".

What this means is you can use all the git functionality on local
branches, as far back as the last svn commit.  As soon as you reach
something that has been committed to svn, though, you have to limit
yourself to svn functionality.

Taking your example, here is the state at the end of steps.txt (with the
patch above applied).  I will mark svn branches in caps, and git
branches in lower-case.

--A--BTRUNK, master
  \
   -C NEWBRANCH, local-newbranch

Say you work on local-newbranch, and other people work on the trunk.
If you do "git svn pull" on master the graph might look like this
(commits which have been committed to SVN in caps, those which only
exist in your local git repo in lower case):

master, TRUNK
  |
  v
--A--B--F--G--H
  \
   -C--d--e
^ ^
| |
 NEWBRANCH   local-newbranch

In this case, commits D and E only exist in git, but everything else has
already been committed to svn.  If you want to have access to commits
F-H on the local-newbranch branch, you will need to do it the svn way;
ie by creating a merge commit on NEWBRANCH which pulls in those changes.
You can do that by passing the --squash option to "git merge", thus:-

$ git checkout local-newbranch
$ git merge --squash trunk

Resulting in:

master, TRUNK
  |
  v
--A--B--F--G--H
  \
   -C--d--e--m
^^
||
 NEWBRANCH  local-newbranch

Here M is a single commit containing all of the changes held in commits
F-H.  Subversion doesn't support the git concept of "multiple parent
commits", so you lose that element of merge history on the graph.  The
merge is marked as having taken place after D and E were written in the
history.  Since you said you wanted to rebase, perhaps that isn't what
you want; you might want the merge to have been performed before your
changes.  You can accomplish that, provided you haven't dcommitted
local-newbranch:-

$ git checkout -b newbranch-merge newbranch
$ git merge --squash trunk
$ git rebase newbranch-merge local-newbranch
$ git branch -D newbranch-merge

master, TRUNK
  |
  v
--A--B--F--G--H
  \
   -C--m--d--e
^^
||
 NEWBRANCH  local-newbranch

Since newbranch-merge hadn't been committed to svn yet, the rebase was
possible and the merge will go down in history as having happened before
the changes on local-newbranch.

> 4. Assuming (3) is possible, will I be able to dcommit "local-newbranch"?

Running a "git svn dcommit" while "local-newbranch" is checked out
should update the newbranch branch on the SVN side, and running it on
"master" should update "trunk".

I would only recommend doing all this if you need to share these
branches with other users of svn, though.  Since branching is so easy
and natural in git, people tend to find themselves making a lot of
local, short-liv

[git-users] Using git-svn to follow a branch: detached

[Chris Stankevitz]

Hello,

Please consider the attached steps which create an SVN repo and setup git 
to track it.

1. Why do "local-newbranch" and "master" not share a common ancestor?

2. How do I make them share a common ancestor?

3. Assuming (2) is possible, will I be able to rebase "master" changes onto 
"local-newbranch"

4. Assuming (3) is possible, will I be able to dcommit "local-newbranch"?

Thank you,

Chris

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

# Init and create SVN repo
ROOT=/home/cstankevitz/Delete
cd ${ROOT}
rm -rf repo.git/ repo.svn svn-repo-checkout/
svnadmin create repo.svn
svn checkout file://${ROOT}/repo.svn svn-repo-checkout
cd ${ROOT}/svn-repo-checkout/
mkdir trunk
echo "line 1" > trunk/a.txt
svn add trunk/ branches/
svn commit -m "Initial commit"
echo "line 2" >> trunk/a.txt
svn commit -m "Added a second line"

# Create a GIT repo that follows the SVN trunk
cd ${ROOT}
git svn clone file://${ROOT}/repo.svn/ --trunk=file://${ROOT}/repo.svn/trunk/ 
repo.git

# Create the SVN branch
cd ${ROOT}/svn-repo-checkout
svn cp --parents file://${ROOT}/repo.svn/trunk/ 
file://${ROOT}/repo.svn/branches/newbranch -m "Created a branch newbranch"
svn up

# Update the GIT repo to follow the SVN branch
cd ${ROOT}/repo.git
git config --add svn-remote.newbranch.url 
file://${ROOT}/repo.svn/branches/newbranch
git config --add svn-remote.newbranch.fetch :refs/remotes/newbranch
git svn fetch newbranch
git checkout -b local-newbranch -t newbranch
git svn rebase newbranch
gitk --all

Re: [git-users] Using Git in a web development environment (specifically with Coda 2 and a web server)

[Serge Matveenko]

On Mon, May 28, 2012 at 3:57 AM, Heronymo Allen  wrote:
> Locally, I've got my dev folder. On the server, I set up a git repository in
> the folder that contains test.domain.com, as well as another repository in
> the folder that contains the domain.com files.
> This means I'll have 3 repos. I can push commits to the test repo, then when
> I'm happy with it, I can push them to the live site?
> Since Coda allows just one server to be defined (I do hope they change
> that...) then perhaps I should connect it to the test domain, and then use
> the GitHub app to push the files to the main domain when they're good to go?
> I figure the files always come from my local, and they don't travel from the
> test domain to the live domain when ready.

As git is distributed scm you can use your described setup.

But personally I prefer to have central bare repository. You could use
github for this ot any other hosted solution or your personal git
server. There I setup permissions for users (other repository clones).
E.g. developer (you) can read and write to repository. Test user
(test.domain.com) has read only access. Production user (domain.com)
has read only access (and restricted to access "release-*" branches
only sometimes on paranoid configurations). Having such setup you are
able to checkout any branch on your test domain and on the production
when you need. Also you are know exactly what branch you are testing
or deploying. You can switch to test or production branch on your
development repository at any time and fix it if you need. And your
development branch(es) will not be touched by those modifications.

Here is blog post I've just found about one simple git usage workflow
http://thinkvitamin.com/code/source-control/git/our-simple-git-workflow/

There are infinite number of the possible git workflow schemes you are
free to implement.


-- 
Serge Matveenko
se...@matveenko.ru
http://www.ohloh.net/accounts/lig
http://ru.linkedin.com/in/sergematveenko

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

Re: [git-users] Using Git in a web development environment (specifically with Coda 2 and a web server)

[Heronymo Allen]

Thanks for the reply. I'll give that a read, looks like some good 
information there. 

Can you tell me if this would be a correct description?

Locally, I've got my dev folder. On the server, I set up a git repository 
in the folder that contains test.domain.com, as well as another repository 
in the folder that contains the domain.com files.
This means I'll have 3 repos. I can push commits to the test repo, then 
when I'm happy with it, I can push them to the live site?
Since Coda allows just one server to be defined (I do hope they change 
that...) then perhaps I should connect it to the test domain, and then use 
the GitHub app to push the files to the main domain when they're good to 
go? I figure the files always come from my local, and they don't travel 
from the test domain to the live domain when ready.


On Saturday, May 26, 2012 4:57:15 AM UTC-4, Serge Matveenko wrote:
>
> On Sat, May 26, 2012 at 4:08 AM, Heronymo Allen  
> wrote: 
>
> It's up to you how do you want to setup your server environment to 
> deploy your code. You may setup your webserver directory as another 
> git repo clone and use 'git pull' to deploy your code from central 
> repo (like github). It's fine for development or testing server. But 
> its usually better to use special deployment mechanisms for production 
> servers if you need to build or test your code before deploying. 
>
> I advise you to read http://en.wikipedia.org/wiki/Continuous_integration 
>
>

-- 
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/-/GdoPq7doRecJ.
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] Using Git in a web development environment (specifically with Coda 2 and a web server)

[Thomas Ferris Nicolaisen]

Maybe the deployment tool Capistrano has some good strategies for this?

https://github.com/capistrano/capistrano/wiki/

At last I'm sure they support Git. Could be overkill for your task, but maybe 
still a good way to learn about deployment.

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

Re: [git-users] Using Git in a web development environment (specifically with Coda 2 and a web server)

[Serge Matveenko]

On Sat, May 26, 2012 at 4:08 AM, Heronymo Allen  wrote:
> Coda 2 can see Git just fine and the version control features are now
> active.
> But how do I use it with my web server? Do I need to install Git onto the
> server?
> Coda can track changes locally, but I don't know if it's working remotely. I
> don't know if Coda can compare the local files to the server files.

It's up to you how do you want to setup your server environment to
deploy your code. You may setup your webserver directory as another
git repo clone and use 'git pull' to deploy your code from central
repo (like github). It's fine for development or testing server. But
its usually better to use special deployment mechanisms for production
servers if you need to build or test your code before deploying.

I advise you to read http://en.wikipedia.org/wiki/Continuous_integration


-- 
Serge Matveenko
se...@matveenko.ru
http://www.ohloh.net/accounts/lig
http://ru.linkedin.com/in/sergematveenko

-- 
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] Using Git in a web development environment (specifically with Coda 2 and a web server)

[Heronymo Allen]

Hi all,

I just purchased Coda 2 yesterday, and I installed Git for version control. 
I also installed the GitHub GUI for Git.
I've never used a version control mechanism and I've always done it 
manually. But I want to learn how to properly set up Git for a web dev 
environment.

I've searched around and read some documentation and tutorials, but it 
doesn't seem like I've found my answers. Also, everything I found was a bit 
overwhelming!

Coda 2 can see Git just fine and the version control features are now 
active. 
But how do I use it with my web server? Do I need to install Git onto the 
server?
Coda can track changes locally, but I don't know if it's working remotely. 
I don't know if Coda can compare the local files to the server files.

Furthermore, and perhaps this is more of a Coda issue, I would like to know 
if it's possible to have a setup where I have a testing server (eg: 
test.domain.com) and a live server (domain.com).
I preview and develop the website on the test subdomain, and then push it 
to the main domain when it's ready to go.
Is this something that Git can help me with? Coda only allows you to define 
one server. That's one thing I miss from Dreamweaver, the ability to define 
multiple servers for testing and live deployment.

If you need more info please don't hesitate to ask.

Any help would be totally appreciated. Thanks to any and all who reply!

-- 
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/-/j-5oQA4vZssJ.
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.

Re: [git-users] using git for system configuration management

[Rick DeNatale]

On Mon, Jan 11, 2010 at 9:08 AM, Brett Viren  wrote:
> On Sun, Jan 10, 2010 at 5:30 PM, Tobias G. Pfeiffer  wrote:
>
>> I want to use git to manage the system configuration (/etc/...) for a
>> number of Linux servers in my network.
>
> You will want more than what git can do.  Look into using Puppet.  You
> can use git to manage the Puppet manifests.

Another option, which most of the cool kids I know seem to be using
these days is Chef

http://wiki.opscode.com/display/chef/Home

-- 
Rick DeNatale

Blog: http://talklikeaduck.denhaven2.com/
Twitter: http://twitter.com/RickDeNatale
WWR: http://www.workingwithrails.com/person/9021-rick-denatale
LinkedIn: http://www.linkedin.com/in/rickdenatale
-- 
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-us...@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.

Re: [git-users] using git for system configuration management

[Brett Viren]

On Sun, Jan 10, 2010 at 5:30 PM, Tobias G. Pfeiffer  wrote:

> I want to use git to manage the system configuration (/etc/...) for a
> number of Linux servers in my network.

You will want more than what git can do.  Look into using Puppet.  You
can use git to manage the Puppet manifests.

-Brett.
-- 
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-us...@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] using git for system configuration management

[Tobias G. Pfeiffer]

Hi!

I want to use git to manage the system configuration (/etc/...) for a 
number of Linux servers in my network. Right now, on every machine, 
/etc/ is a git repository where I locally commit after every change to 
config files, software upgrades etc.

Now I thought that it would be great to have a central git repository 
that stores the configuration that is the same for all machines and I 
could do
 server-1 $ (edit config)
 server-1 $ git commit
 server-1 $ git push
and then on all other servers:
 server-n $ git pull
to get the changes.

However, there is a number of problems with that:
 * Each machine has of course some files whose content is local to that 
machine (e.g. /etc/hostname).
 * Each machine has folders that are beyond the "core config" (e.g. 
/etc/apache2 for a web server and /etc/postgresql for a database 
server).
I also want these local files and folders to be under revision control 
using git, but I don't know what is a/the best possible way to do it, 
i.e. have the "general part" and the "local part", all mixed up in one 
directory.

One way to go, I guess, would be to have
  /etc -- general part
  /etc_local -- local part
and just symlink everything that's not part of the general config from 
/etc_local to /etc. But maybe someone else has a better idea?

Thanks for your help,
Tobias

-- 
design the future... now!
-- 
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-us...@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] using git for system configuration management

[Tobias G. Pfeiffer]

Hi!

I want to use git to manage the system configuration (/etc/...) for a 
number of Linux servers in my network. Right now, on every machine, 
/etc/ is a git repository where I locally commit after every change to 
config files, software upgrades etc.

Now I thought that it would be great to have a central git repository 
that stores the configuration that is the same for all machines and I 
could do
 server-1 $ (edit config)
 server-1 $ git commit
 server-1 $ git push
and then on all other servers:
 server-n $ git pull
to get the changes.

However, there is a number of problems with that:
 * Each machine has of course some files whose content is local to that 
machine (e.g. /etc/hostname).
 * Each machine has folders that are beyond the "core config" (e.g. 
/etc/apache2 for a web server and /etc/postgresql for a database 
server).
I also want these local files and folders to be under revision control 
using git, but I don't know what is a/the best possible way to do it, 
i.e. have the "general part" and the "local part", all mixed up in one 
directory.

One way to go, I guess, would be to have
  /etc -- general part
  /etc_local -- local part
and just symlink everything that's not part of the general config from 
/etc_local to /etc. But maybe someone else has a better idea?

Thanks for your help,
Tobias

-- 
design the future... now!


signature.asc
Description: This is a digitally signed message part.

[git-users] Using Git to bisect Wine

[fester225]

I'm attempting to use Git (1.6.3.3) to bisect Wine.
When I ran: git bisect start, I got: fatal: invalid reference: master.

How do I get rid of the error?

--

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