Re: Slightly off topic, question about git

2022-06-12 Thread David Holland
On Mon, Jun 06, 2022 at 02:40:29PM +0200, Gerhard Sittig wrote: > There is no problem with that I assume. From personal experience > I can tell that git takes some getting used to. But once you do > you don't want to go back. Seriously. Every time I have to use the damn thing, I want to go

Re: Slightly off topic, question about git

2022-06-08 Thread Taylor R Campbell
> Date: Wed, 8 Jun 2022 22:22:40 +0200 > From: Reinoud Zandijk > > My (little) experience with git is that merging ie applying patches > from others is a lot better in CVS! I never really have merge > conflicts in CVS but in the project I used git on it was horrible > for no obvious reasons so I

Re: Slightly off topic, question about git

2022-06-08 Thread Reinoud Zandijk
On Mon, Jun 06, 2022 at 09:12:58AM -0400, Mouse wrote: > > It sortof have to. Since if you've done various work, and others > > have done various work on the same files, and both have done commits, > > it might not be possible to merge as is. > > Yes, merging can require manual assistance. git

Re: Slightly off topic, question about git

2022-06-08 Thread Gerhard Sittig
On Wed, 2022-06-08 at 06:45 -0400, Mouse wrote: > > > Interactive add ('git add -u -p', and 'git reset -p' before 'git > > commit') lets you separate unrelated changes into individual commits > > as they should be. > > Based on the documentation I've seen, though, they're somewhat > crippled, in

Re: Slightly off topic, question about git

2022-06-08 Thread Mouse
> That git thinks of the whole content of the tree, and that a filter > is applied to narrow the result set when you specify dirs or files, > was mentioned before. Changes your perspective. Also breaks git for certain uses, though. Much as I like git, there are places where I'd like to use it

Re: Slightly off topic, question about git

2022-06-08 Thread Gerhard Sittig
[ incomplete list of git features that a BSD developer may like ] On Mon, 2022-06-06 at 14:40 +0200, Gerhard Sittig wrote: > > [ ... Brian Buhrow asked for useful access to VCS history ... ] Your question started with a specific command accessing the information for a single file ('cvs log

Re: Slightly off topic, question about git

2022-06-06 Thread Gerhard Sittig
On Mon, 2022-06-06 at 15:39 +0200, Johnny Billquist wrote: > > On 2022-06-06 15:12, Mouse wrote: > [H]istory rewriting seems to be a favorite pastime of git users. > >>>That's not a fault of git; that's a fault of how some people use > >>>git. > >>Well, you could argue that it's a fault in git

Re: Slightly off topic, question about git

2022-06-06 Thread matthew sporleder
On Mon, Jun 6, 2022 at 8:24 AM Mouse wrote: > > [...], I have a question about git, [...] > > I'm not an _expert_ on git, but I have been using it for close on a > decade now and have developed a certain amount of expertise. > > > 1. In CVS, I can do something like: > > cvs log

Re: Slightly off topic, question about git

2022-06-06 Thread Johnny Billquist
On 2022-06-06 15:12, Mouse wrote: [H]istory rewriting seems to be a favorite pastime of git users. That's not a fault of git; that's a fault of how some people use git. Well, you could argue that it's a fault in git that it allows it. If there is a way, then some people will use it that

Re: Slightly off topic, question about git

2022-06-06 Thread Mouse
>>> [H]istory rewriting seems to be a favorite pastime of git users. >> That's not a fault of git; that's a fault of how some people use >> git. > Well, you could argue that it's a fault in git that it allows it. > If there is a way, then some people will use it that way. But, if there isn't,

Re: Slightly off topic, question about git

2022-06-06 Thread Gerhard Sittig
On Mon, 2022-06-06 at 08:33 -0400, Mouse wrote: > > > I've recently come to realize a thing with git I really abhor. It > > has a very loose view on history immutability. I've seen branches, > > which claims to come from some point, where the branch is way older > > than the revision it claims

Re: Slightly off topic, question about git

2022-06-06 Thread Gerhard Sittig
[ For those in a hurry: Do get the Pro Git book, maybe watch the Linus and Scott videos. They helped me "get it", and wish to never go back to a life without git. :-D Seriously! ] On Sun, 2022-06-05 at 22:59 -0700, Brian Buhrow wrote: > > [ ... ] I should preface my comments with the caveat

Re: Slightly off topic, question about git

2022-06-06 Thread Johnny Billquist
On 2022-06-06 14:33, Mouse wrote: I've recently come to realize a thing with git I really abhor. It has a very loose view on history immutability. I've seen branches, which claims to come from some point, where the branch is way older than the revision it claims to have been branched off.

Re: Slightly off topic, question about git

2022-06-06 Thread Mouse
> I've recently come to realize a thing with git I really abhor. It > has a very loose view on history immutability. I've seen branches, > which claims to come from some point, where the branch is way older > than the revision it claims to have been branched off. Which > obviously is

Re: Slightly off topic, question about git

2022-06-06 Thread Mouse
> [...], I have a question about git, [...] I'm not an _expert_ on git, but I have been using it for close on a decade now and have developed a certain amount of expertise. > 1. In CVS, I can do something like: > cvs log sys/dev/pci/if_bge.c > and be given a complete history of the changes to

Re: Slightly off topic, question about git

2022-06-06 Thread Johnny Billquist
On 2022-06-06 11:32, Greg Troxel wrote: David Brownlee writes: I suspect most of this also works with s/git/hg/ assuming NetBSD switches to a mercurial repo Indeed, all of this is not really about git. Systems in the class of "distributed VCS" have two important properties: commits

Re: Slightly off topic, question about git

2022-06-06 Thread matthew sporleder
> On Jun 6, 2022, at 2:00 AM, Brian Buhrow wrote: > > Hello. At the risk of raising the debate about which version control > system we should > use, I have a question about git, as well as a comment about it relative to > the NetBSD source > tree. I should preface my comments with the

Re: Slightly off topic, question about git

2022-06-06 Thread Greg Troxel
David Brownlee writes: > I suspect most of this also works with s/git/hg/ assuming NetBSD > switches to a mercurial repo Indeed, all of this is not really about git. Systems in the class of "distributed VCS" have two important properties: commits are atomic across the repo, not per file

Re: Slightly off topic, question about git

2022-06-06 Thread David Brownlee
On Mon, 6 Jun 2022 at 06:59, Brian Buhrow wrote: > > Hello. At the risk of raising the debate about which version control > system we should > use, I have a question about git, as well as a comment about it relative to > the NetBSD source > tree. I should preface my comments with the

Slightly off topic, question about git

2022-06-05 Thread Brian Buhrow
Hello. At the risk of raising the debate about which version control system we should use, I have a question about git, as well as a comment about it relative to the NetBSD source tree. I should preface my comments with the caveat that I am not by any means a git expert, and, in fact,