Re: git submodules in ~ (was: Introductory git article?)
On Thu, 2008-02-21 at 15:52 +0530, Manish wrote: > 2008/2/21 martin f krafft <[EMAIL PROTECTED]>: > > also sprach Manish <[EMAIL PROTECTED]> [2008.02.21.0811 +0100]: > > > > > > I personally prefer the mr tool to submodules for this task. > > > > > > Can you please share your .mrconfig? > > > > No, it contains sensitive information, like client names and the > > like. What are you looking for anyway? > > I wanted to know how you were using mr to manage submodules but like > you said you are not. Guess I just need a clean layout. I use mr to manage a bunch of subversion repositories. Basically, you segment your concerns into a bunch of projects. I have one for my thesis research, one for each of my classes, and one for ~/bin. My mrconfig looks something like this: [/home/bloom] checkout = svn co svn://x.x.com/home-base bloom update = /home/bloom/bin/svn-clean-conflicts; svn up "$@" commit = /home/bloom/bin/svn-clean-conflicts; svn commit "$@" [bin] checkout = svn co svn://x.x.com/bin bin [586] checkout = svn co 'svn://x.x.com/parts/school/cs586' '586' [529] checkout = svn co 'svn://x.x.com/parts/school/cs529' '529' [research] checkout = svn co svn://x.x.com/parts/research research Then I use subcommands of mr to do all of my commits, updates, and svn subcommands for things like add, revert, etc... (mr has nice rules for autodetecting the repository type, so I don't need to specify update and commit commands for most of my repositories. For /home/bloom, I have a special hook to clean up certain files with bothsersome metadata before committing them, so as to avoid dealing with conflicts.) There are no svn:externals anywhere in my repository structure, which is nice because, in general I check out different subsets of my home directory on to different machines, so I just add them ad-hoc when I need them on each machine. Also, AIUI, svn:externals doesn't buy anything because svn commit doesn't recurse into svn:externals anyway. If you have a static repository layout you like to keep around, you can commit your .mrconfig into the repository. You can also have .mrconfig files in directories, and configure your main .mrconfig to chain to the subdirectory .mrconfigs. The idea of having submodules that are recognized by your vcs only really makes sense if you're using CVS (which recurses into whatever directories it sees when commiting and updating), but using CVS doesn't make sense in a whole lot of other ways. --Ken -- Ken (Chanoch) Bloom. PhD candidate. Linguistic Cognition Laboratory. Department of Computer Science. Illinois Institute of Technology. http://www.iit.edu/~kbloom1/ signature.asc Description: This is a digitally signed message part ___ vcs-home mailing list vcs-home@lists.madduck.net http://lists.madduck.net/listinfo/vcs-home
Re: git submodules in ~ (was: Introductory git article?)
also sprach Manish <[EMAIL PROTECTED]> [2008.02.21.1122 +0100]: > I wanted to know how you were using mr to manage submodules but like > you said you are not. Guess I just need a clean layout. Define "submodule"? I am using mr to manage my ~. Please read http://colabti.org/irclogger/irclogger_log/git?date=2007-09-06,Thu&sel=578#l979 and note that I have since replaced colgit with mr. -- martin | http://madduck.net/ | http://two.sentenc.es/ "no woman should ever be quite accurate about her age. it looks so calculating." -- oscar wilde spamtraps: [EMAIL PROTECTED] digital_signature_gpg.asc Description: Digital signature (see http://martin-krafft.net/gpg/) ___ vcs-home mailing list vcs-home@lists.madduck.net http://lists.madduck.net/listinfo/vcs-home
Re: git submodules in ~ (was: Introductory git article?)
2008/2/21 martin f krafft <[EMAIL PROTECTED]>: > also sprach Manish <[EMAIL PROTECTED]> [2008.02.21.0811 +0100]: > > > > I personally prefer the mr tool to submodules for this task. > > > > Can you please share your .mrconfig? > > No, it contains sensitive information, like client names and the > like. What are you looking for anyway? > > I wanted to know how you were using mr to manage submodules but like you said you are not. Guess I just need a clean layout. -- Manish ___ vcs-home mailing list vcs-home@lists.madduck.net http://lists.madduck.net/listinfo/vcs-home
Re: git submodules in ~ (was: Introductory git article?)
also sprach Manish <[EMAIL PROTECTED]> [2008.02.21.0811 +0100]: > > I personally prefer the mr tool to submodules for this task. > > Can you please share your .mrconfig? No, it contains sensitive information, like client names and the like. What are you looking for anyway? -- martin | http://madduck.net/ | http://two.sentenc.es/ "by accepting this brick through your window, you accept it as is and agree to my disclaimer of all warranties, express or implied, as well as disclaimers of all liability, direct, indirect, consequential or incidental, that may arise from the installation of this brick into your building." -- seen on irc spamtraps: [EMAIL PROTECTED] digital_signature_gpg.asc Description: Digital signature (see http://martin-krafft.net/gpg/) ___ vcs-home mailing list vcs-home@lists.madduck.net http://lists.madduck.net/listinfo/vcs-home
Re: git submodules in ~ (was: Introductory git article?)
also sprach Casey Link <[EMAIL PROTECTED]> [2008.02.20.2352 +0100]: > Do you use the mr tool instead of git submodules? Yes. See http://colabti.org/irclogger/irclogger_log/git?date=2007-09-06,Thu&sel=578#l979 -- martin | http://madduck.net/ | http://two.sentenc.es/ "welcome to american airlines, sir. here's your avocado - remember to keep it turned on and with you at all times. please turn your luggage over to the armadillos for rootling." -- http://azure.humbug.org.au/~aj/armadillos.txt spamtraps: [EMAIL PROTECTED] digital_signature_gpg.asc Description: Digital signature (see http://martin-krafft.net/gpg/) ___ vcs-home mailing list vcs-home@lists.madduck.net http://lists.madduck.net/listinfo/vcs-home
Re: git submodules in ~ (was: Introductory git article?)
2008/2/20 martin f krafft <[EMAIL PROTECTED]>: > also sprach Jens Peter Secher <[EMAIL PROTECTED]> [2008.02.17.1252 +0100]: > > I tried various systems, but ended up only moving (and linking) > > private dotfiles like .ssh/ and .gnupg/ in a git submodule. That > > way I can check out my homedir without the private stuff on an > > insecure machine, as others have described. > > The way submodules work is that the parent has a reference to > a specific revision of a submodule. So if you have two machines and > each have a submodule in ~/foo at commit A and you add some commits > to the first ~/foo submodule and push them, you cannot just tell > your ~ on the other machine to update; instead, you have to pull > ~/foo and then commit ~ to tell it about the updated submodule. > > I personally prefer the mr tool to submodules for this task. > Can you please share your .mrconfig? -- Manish ___ vcs-home mailing list vcs-home@lists.madduck.net http://lists.madduck.net/listinfo/vcs-home
Re: git submodules in ~ (was: Introductory git article?)
2008/2/20 martin f krafft <[EMAIL PROTECTED]>: > The way submodules work is that the parent has a reference to > a specific revision of a submodule. So if you have two machines and > each have a submodule in ~/foo at commit A and you add some commits > to the first ~/foo submodule and push them, you cannot just tell > your ~ on the other machine to update; instead, you have to pull > ~/foo and then commit ~ to tell it about the updated submodule. > > I personally prefer the mr tool to submodules for this task. > Do you use the mr tool instead of git submodules? Or do you use mr to manage your git submodules? I am trying to figure out the best way to setup nested git repos and manage them. That is ~/src is one ~/docs is one ~/docs/foo is another, etc. Casey ___ vcs-home mailing list vcs-home@lists.madduck.net http://lists.madduck.net/listinfo/vcs-home
git submodules in ~ (was: Introductory git article?)
also sprach Jens Peter Secher <[EMAIL PROTECTED]> [2008.02.17.1252 +0100]: > I tried various systems, but ended up only moving (and linking) > private dotfiles like .ssh/ and .gnupg/ in a git submodule. That > way I can check out my homedir without the private stuff on an > insecure machine, as others have described. The way submodules work is that the parent has a reference to a specific revision of a submodule. So if you have two machines and each have a submodule in ~/foo at commit A and you add some commits to the first ~/foo submodule and push them, you cannot just tell your ~ on the other machine to update; instead, you have to pull ~/foo and then commit ~ to tell it about the updated submodule. I personally prefer the mr tool to submodules for this task. -- martin | http://madduck.net/ | http://two.sentenc.es/ "never attribute to malice what can be adequately explained by incompetence." -- mark twain spamtraps: [EMAIL PROTECTED] digital_signature_gpg.asc Description: Digital signature (see http://martin-krafft.net/gpg/) ___ vcs-home mailing list vcs-home@lists.madduck.net http://lists.madduck.net/listinfo/vcs-home
Re: Introductory git article?
On 16/02/2008, Casey Link <[EMAIL PROTECTED]> wrote: > > I have been doing a lot of research into putting my home directory > under version control and most of what I have found discusses the > process in terms of Subversion. For me a DVCS is preferable to a > centralized model because I would not have to rely on a central SVN > server off somewhere in the cloud. Is anyone familiar with a good > introductory article to using git as a personal VCS? Not AFAIK. I am using git for my home directory, but I have not written up anything yet. > One question I had - which doesn't apply only to git - when do you do > your commits? Do you commit after every change, before you logout or > end your "session" (i.e. walk away from the computer), or just > whenever you feel like it? Every now and then I do a git diff to see what configuration changes I have pending, and those that have been working out fine I commit. My projects are in git submodules, and for those I commit whenever I have finished and tested a piece of work, or occasionally when I have to put it away for more pressing real-life issues. I usually do git push after a commit, as backup. > Another question regarding dotfiles in ~ : if you move your dotfiles > to other directories how do you handle newly installed programs? It > seems like handling that would be a major headache and very time > consuming. I tried various systems, but ended up only moving (and linking) private dotfiles like .ssh/ and .gnupg/ in a git submodule. That way I can check out my homedir without the private stuff on an insecure machine, as others have described. When new files pop up during git status, I investigate their contents and then put them in .gitignore, add them to the repository, or simply defer doing anything until I have the time. So it is very ad-hoc.. HTH, -- Jens Peter Secher. _DD6A 05B0 174E BFB2 D4D9 B52E 0EE5 978A FE63 E8A1 jpsecher gmail com_. A. Because it breaks the logical sequence of discussion. Q. Why is top posting bad? ___ vcs-home mailing list vcs-home@lists.madduck.net http://lists.madduck.net/listinfo/vcs-home
Introductory git article?
Hello, I have been doing a lot of research into putting my home directory under version control and most of what I have found discusses the process in terms of Subversion. For me a DVCS is preferable to a centralized model because I would not have to rely on a central SVN server off somewhere in the cloud. Is anyone familiar with a good introductory article to using git as a personal VCS? One question I had - which doesn't apply only to git - when do you do your commits? Do you commit after every change, before you logout or end your "session" (i.e. walk away from the computer), or just whenever you feel like it? Another question regarding dotfiles in ~ : if you move your dotfiles to other directories how do you handle newly installed programs? It seems like handling that would be a major headache and very time consuming. Regards, Casey ___ vcs-home mailing list vcs-home@lists.madduck.net http://lists.madduck.net/listinfo/vcs-home
