Re: Switching heads and head vs branch after CVS import

2005-08-15 Thread Johannes Schindelin
Hi, On Mon, 15 Aug 2005, Linus Torvalds wrote: > I was seriously considering just breaking the "remote cvs" support > entirely (you can always just use cvsup or something to download it to > make it local), and just taking the RCS parsing code from GNU rcs/cvs and > making a C language CVS import

Re: Switching heads and head vs branch after CVS import

2005-08-15 Thread Linus Torvalds
On Tue, 16 Aug 2005, Martin Langhoff wrote: > > If I find the time, I'll add some sort of pattern-match parameters to > be tried against the commitmsg to extract likely head/branch names > where we are merging from. My problem right now is that the only cvs > repo with interesting branches and m

Re: Switching heads and head vs branch after CVS import

2005-08-15 Thread Wolfgang Denk
In message <[EMAIL PROTECTED]> you wrote: > > If I find the time, I'll add some sort of pattern-match parameters to > be tried against the commitmsg to extract likely head/branch names > where we are merging from. My problem right now is that the only cvs > repo with interesting branches and merges

Re: Switching heads and head vs branch after CVS import

2005-08-15 Thread Martin Langhoff
On 8/16/05, Linus Torvalds <[EMAIL PROTECTED]> wrote: > The good news is that if you guess wrong, and you claim a merge where none > exists, it doesn't really do any real damage. I had figured out what part of the code I wanted to hack, but was concerned that marking things that were merges in cv

Re: Switching heads and head vs branch after CVS import

2005-08-15 Thread Linus Torvalds
On Mon, 15 Aug 2005, Wolfgang Denk wrote: > > I asked this question before without receiving any reply: > > Assume I know exactly where the merge back happenend - is there any > way to tell git about it, so I don't see all these dangling heads any > more? You'd have to teach cvsimport about

Re: Switching heads and head vs branch after CVS import

2005-08-15 Thread Sven Verdoolaege
On Mon, Aug 15, 2005 at 12:38:53PM +0200, Matthias Urlichs wrote: > Hi, Wolfgang Denk wrote: > > > Assume I know exactly where the merge back happenend - is there any > > way to tell git about it, so I don't see all these dangling heads any > > more? > > Two ways: > - you can enhance cvs2git to

Re: Switching heads and head vs branch after CVS import

2005-08-15 Thread Matthias Urlichs
Hi, Wolfgang Denk wrote: > Assume I know exactly where the merge back happenend - is there any > way to tell git about it, so I don't see all these dangling heads any > more? Two ways: - you can enhance cvs2git to do it at the appropriate time. Good luck. - after the fact, and after finding the

Re: Switching heads and head vs branch after CVS import

2005-08-15 Thread Martin Langhoff
On 8/15/05, Matthias Urlichs <[EMAIL PROTECTED]> wrote: > Umm, actually, no, cvsimport doesn't do merges. Dunno where Martin got his > from, but it wasn't me. ;-) Just wishful thinking, and a viewing things on a remote box over a slow x11-over-ssh connection. When I think about it, it doesn't seem

Re: Switching heads and head vs branch after CVS import

2005-08-15 Thread Matthias Urlichs
Hi, Linus Torvalds wrote: >> There may be some surprises in here! gitk --all shows at least one >> branch opening and merging back into origin, and it has figured it out >> correctly > > Oh, wow. The new cvsimport is obviously being a hell of a lot smarter > than my original one was. Goodie. Umm,

Re: Switching heads and head vs branch after CVS import

2005-08-15 Thread Wolfgang Denk
In message <[EMAIL PROTECTED]> you wrote: > > One thing that "git cvsimport" does not know to do is to show when a > branch was merged back into the HEAD. That would be a very interesting > thing to see, but I don't think there's any way to get that information > out of CVS (so you'd have to basic

Re: Switching heads and head vs branch after CVS import

2005-08-15 Thread Sven Verdoolaege
On Sun, Aug 14, 2005 at 07:49:26PM -0700, Linus Torvalds wrote: > On Mon, 15 Aug 2005, Martin Langhoff wrote: > > Except for the keyword expansion. surely there's a way to tell cvsps > > to not do it. Why would we ever want it? > > Ahh. I don't think we should blame cvsps, I think cvsimport should

Re: Switching heads and head vs branch after CVS import

2005-08-14 Thread Linus Torvalds
On Mon, 15 Aug 2005, Martin Langhoff wrote: > > > So in a cvsimport, you'll never see a merge back to the head, even if one > > technically took place. > > There may be some surprises in here! gitk --all shows at least one > branch opening and merging back into origin, and it has figured it out

Re: Switching heads and head vs branch after CVS import

2005-08-14 Thread Martin Langhoff
> Just do > > git checkout branch-name > > to switch between them. thanks! I was doing cg-branch-chg branch-name and it wasn't working. > So in a cvsimport, you'll never see a merge back to the head, even if one > technically took place. There may be some surprises in here! gitk --all

Re: Switching heads and head vs branch after CVS import

2005-08-14 Thread Linus Torvalds
On Mon, 15 Aug 2005, Martin Langhoff wrote: > > After having done a cvs import of Moodle using git-cvsimport-script > all the cvs branches show up as heads. How do I switch heads within a > checkout? cogito doesn't seem to be able to, and I'm unsure on how to > do it with git. Just do g

Re: Switching heads and head vs branch after CVS import

2005-08-14 Thread Junio C Hamano
Martin Langhoff <[EMAIL PROTECTED]> writes: > After having done a cvs import of Moodle using git-cvsimport-script > all the cvs branches show up as heads. How do I switch heads within a > checkout? cogito doesn't seem to be able to, and I'm unsure on how to > do it with git. The documentation may