Cleaned up Debian files.
Conflict with cgvg instead of not installing cg.
Pass prefix=/usr to "make install".
---
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+cogito (0.13-1) stable; urgency=low
+
+ * New version.
+ * Cleaned up
Hi, Junio!
On Wed, 2005-08-10 at 23:31 -0700, Junio C Hamano wrote:
> Junio C Hamano <[EMAIL PROTECTED]> writes:
>
> > Sorry, sent it out without finishing. The worst is "return".
>
> Ah, my mistake. You have the eval that can eval "return" in a
> function and let that "return" return from tha
Hi, Sebastian Kuzminsky wrote:
> People still use GNU Interactive Tools. Not just crazy, stupid people,
> and I bet not just Debian people.
Possibly. But the number of people running both git and git are, I'd bet,
smaller than those who will send annoying emails when they install git and
can't r
Run gitk on the kernel archive, wait for it to finish reading commit
changesets, scroll to the middle, and watch all the pretty (NOT)
superfluous vertical lines appear and disappear pseudo-randomly.
Looks like something in there (TK or even X11, most likely) cuts off
screen coordinates after 16 bi
On Wed, 10 Aug 2005, Sebastian Kuzminsky wrote:
>
> People still use GNU Interactive Tools. Not just crazy, stupid people,
> and I bet not just Debian people.
Why do you say that?
Do you have anybody who actually does, or are you just claiming so?
Some distributions seems to disagree with yo
Hi, Josef Weidendorfer wrote:
> My understanding of .git/branches was that Cogito uses this as mapping of
> remote branches/heads to local branches/refs, and not to store shortcuts for
> remote git repositories.
That seems to be the case, yes.
I'd argue that the shortcut idea is inherently mor
Linus Torvalds <[EMAIL PROTECTED]> wrote:
>
> On Wed, 10 Aug 2005, Sebastian Kuzminsky wrote:
> >
> > People still use GNU Interactive Tools. Not just crazy, stupid people,
> > and I bet not just Debian people.
>
> Why do you say that?
>
> Do you have anybody who actually does, or are you just
Linus Torvalds <[EMAIL PROTECTED]> writes:
> On Wed, 10 Aug 2005, Sebastian Kuzminsky wrote:
>>
>> People still use GNU Interactive Tools. Not just crazy, stupid people,
>> and I bet not just Debian people.
>
> Why do you say that?
>
> Do you have anybody who actually does, or are you just claim
>
> Anyway, enough of this. I understand the name will not change and I'm
> ok with that. I'll deal with it on our (Debian's) end.
The easy fix is to kill the small git script that is not
mandatory anyway (as far as my quick grep told me).
The cg script has a bit more value.
Sam
-
To
Sam Ravnborg <[EMAIL PROTECTED]> wrote:
> >
> > Anyway, enough of this. I understand the name will not change and I'm
> > ok with that. I'll deal with it on our (Debian's) end.
>
> The easy fix is to kill the small git script that is not
> mandatory anyway (as far as my quick grep told me).
>
Hi,
Sam Ravnborg:
> >
> > Anyway, enough of this. I understand the name will not change and I'm
> > ok with that. I'll deal with it on our (Debian's) end.
>
> The easy fix is to kill the small git script that is not
> mandatory anyway (as far as my quick grep told me).
I'd vote to keep the sc
On Thu, Aug 11, 2005 at 10:24:10PM +0200, Matthias Urlichs wrote:
> Hi,
>
> Sam Ravnborg:
> > >
> > > Anyway, enough of this. I understand the name will not change and I'm
> > > ok with that. I'll deal with it on our (Debian's) end.
> >
> > The easy fix is to kill the small git script that is
Hi,
Sebastian Kuzminsky:
> > The cg script has a bit more value.
>
> Tried that too, and I got the bug reports to prove it. ;-)
>
Another possible solution: Rename git's git to X and install ours as Y.
Ask the user which should be symlinked to /usr/bin/git, if both are
installed, via the existi
Matthias Urlichs <[EMAIL PROTECTED]> wrote:
> Another possible solution: Rename git's git to X and install ours as Y.
> Ask the user which should be symlinked to /usr/bin/git, if both are
> installed, via the existing "alternatives" system.
I suggested this on debian-devel, and was told that updat
On Thursday 11 August 2005 15:11, Junio C Hamano wrote:
>Linus Torvalds <[EMAIL PROTECTED]> writes:
>> On Wed, 10 Aug 2005, Sebastian Kuzminsky wrote:
>>> People still use GNU Interactive Tools. Not just crazy, stupid
>>> people, and I bet not just Debian people.
>>
>> Why do you say that?
>>
>> D
On Thu, 11 Aug 2005, Sam Ravnborg wrote:
>
> The easy fix is to kill the small git script that is not
> mandatory anyway (as far as my quick grep told me).
It's not "mandatory", but the tutorial etc use it as an example.
In other words, if you remove the git script, you are going to have a
_b
On Thu, 11 Aug 2005, Sebastian Kuzminsky wrote:
>
> What I have is bug reports against the cogito package, from people who
> want to install both. The reports came very soon after I released the
> package, so I dont think it's a totally freak occurance.
The point is, people have the thing _ins
Dear diary, on Sun, Aug 07, 2005 at 12:34:36AM CEST, I got a letter
where Sam Ravnborg <[EMAIL PROTECTED]> told me that...
> I accidently commited too many files to my tree today, and now I want to
> drop the commit so I have logically separate commits.
>
> What is the right way to do this - in co
Sanjoy Mahajan <[EMAIL PROTECTED]> writes:
> I'm having doing a stupidity with git, but here's what is confusing me
> about using bisect:
>
> If I start with a clean directory except for a 2.6 .git/ (where master =
> d95a1b4818f2fe38a3cfc9a7d5817dc9a1a69329), then do
>
> $ cd linux-2.6
> $ ls
> $
Matthias Urlichs wrote:
A small Debian-specific patch to rename the offending scripts (and drop
the Conflicts: entries) is cheap.
Not sure I understand the proper use of dpkg-divert in Debian, but could
_this_ git-core package perhaps ask the user which set of the two
packages he wish to
Alan Chandler <[EMAIL PROTECTED]> wrote:
> Matthias Urlichs wrote:
> > A small Debian-specific patch to rename the offending scripts (and drop
> > the Conflicts: entries) is cheap.
>
> Not sure I understand the proper use of dpkg-divert in Debian, but could
> _this_ git-core package perhaps ask t
Dear diary, on Tue, Aug 09, 2005 at 12:42:36AM CEST, I got a letter
where Junio C Hamano <[EMAIL PROTECTED]> told me that...
> Johannes Schindelin <[EMAIL PROTECTED]> writes:
>
> > BTW, if you are lazy, like me, you just pull from Junio once in a while
> > and do a "make test". Turns out there is
Linus Torvalds <[EMAIL PROTECTED]> wrote:
> Hands up people. Does anybody _use_ GNU interactive tools? None of this "I
> have a package" crap.
Obviously no one on the git list uses GNU Interactive Tools, or this
problem would have been caught much sooner.
It's only when you release it into the w
Gene Heskett <[EMAIL PROTECTED]> writes:
>>rank nameinstvote old recent
>>6591 git 114 24 83 7
>>2 git-core 2 1 0 1 (Not in sid)
>>29939 cogito-scm 1 0 1 0 (Not in sid)
>
> Thi
Dear diary, on Tue, Aug 09, 2005 at 04:49:26AM CEST, I got a letter
where Junio C Hamano <[EMAIL PROTECTED]> told me that...
> Johannes Schindelin <[EMAIL PROTECTED]> writes:
>
> > Junio remarked that Jeff's git-changes-script still uses git-rev-tree, and
> > therefore it should not be removed. T
Dear diary, on Tue, Aug 09, 2005 at 06:06:10PM CEST, I got a letter
where Dirk Behme <[EMAIL PROTECTED]> told me that...
> Hello,
Hello,
> >cg-clone http://www.kernel.org/pub/scm/git/git.git
> defaulting to local storage area
> warning: templates not found /home/user/share/git-core/templates/
>
Dear diary, on Wed, Aug 10, 2005 at 04:38:08PM CEST, I got a letter
where John Ellson <[EMAIL PROTECTED]> told me that...
> Linus Torvalds wrote:
> >
> >On Tue, 9 Aug 2005, John Ellson wrote:
> >
> >>I hacked this:
>
> >No. ...
>
> >So you could do something like ...
>
> >(totally untested)
> >
On Thu, 2005-08-11 at 16:20 -0600, Sebastian Kuzminsky wrote:
> Linus Torvalds <[EMAIL PROTECTED]> wrote:
> > Hands up people. Does anybody _use_ GNU interactive tools? None of this "I
> > have a package" crap.
>
> Obviously no one on the git list uses GNU Interactive Tools, or this
> problem wou
Hi,
Linus Torvalds:
> Hands up people. Does anybody _use_ GNU interactive tools? None of this "I
> have a package" crap.
>
You're preaching to the converted here.
The Debian-package-for-Debian could pop up a notice asking the user to
symlink /usr/local/bin/git => /usr/bin/gitscm (or whatever) i
Petr Baudis <[EMAIL PROTECTED]> writes:
> $ git-cat-file commit bf570303153902ec3d85570ed24515bcf8948848 | grep tree
> tree 41f10531f1799bbb31a1e0f7652363154ce96f45
> $ git-read-tree 41f10531f1799bbb31a1e0f7652363154ce96f45
> fatal: failed to unpack tree object 41f10531f1799bbb31a1e0f7652363154ce9
Dear diary, on Sat, Aug 06, 2005 at 09:14:03AM CEST, I got a letter
where Pavel Roskin <[EMAIL PROTECTED]> told me that...
> Hello, Petr!
Hello,
> Sorry for delay.
no problem, and sorry for another delay on my side too. :-)
> On Sun, 2005-07-10 at 17:46 +0200, Petr Baudis wrote:
> > (v) Semanti
On Thu, 11 Aug 2005, Junio C Hamano wrote:
> Petr Baudis <[EMAIL PROTECTED]> writes:
>
> > $ git-cat-file commit bf570303153902ec3d85570ed24515bcf8948848 | grep tree
> > tree 41f10531f1799bbb31a1e0f7652363154ce96f45
> > $ git-read-tree 41f10531f1799bbb31a1e0f7652363154ce96f45
> > fatal: failed to
Junio C Hamano <[EMAIL PROTECTED]> writes:
> Last time I checked, git-http-pull did not utilize the pack
> dependency information, which indeed is wrong. When it decides
> to fetch a pack instead of an asked-for object, it should check
> which commits the pack expects to have in your local reposi
Hi, Petr!
Unfortunately, my latest revision of cg-clean has "committed suicide"
just when I was about to post it. Anyway, I would prefer to wait until
you apply my patch to cg-status to ignore all ignores. That would allow
me to reuse cg-status.
On Fri, 2005-08-12 at 01:29 +0200, Petr Baudis wr
Dear diary, on Fri, Aug 12, 2005 at 02:54:13AM CEST, I got a letter
where Pavel Roskin <[EMAIL PROTECTED]> told me that...
> Hi, Petr!
Hi,
> Unfortunately, my latest revision of cg-clean has "committed suicide"
> just when I was about to post it. Anyway, I would prefer to wait until
> you apply
Also add some illustration requested by Linus.
Signed-off-by: Junio C Hamano <[EMAIL PROTECTED]>
---
merge-base.c | 74 +-
1 files changed, 68 insertions(+), 6 deletions(-)
5cbb01b3bb1828759596bff71e16cfcee798491c
diff --git a/merge-base
Dear diary, on Tue, Jul 12, 2005 at 06:48:50PM CEST, I got a letter
where Linus Torvalds <[EMAIL PROTECTED]> told me that...
> Then "cg-seek" and "cg-unseek" would continue to work, but the core git
> layer would never be confused because they're really using normal
> branches?
That makes sense,
Daniel Barkalow <[EMAIL PROTECTED]> writes:
> It should work anyway,...
That is true. Please forget about the "recommendation" to slurp
packs and not falling back on commit walker.
Thanks for the patch.
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message t
On Thu, 11 Aug 2005, Junio C Hamano wrote:
> Daniel Barkalow <[EMAIL PROTECTED]> writes:
>
> > It should work anyway,...
>
> That is true. Please forget about the "recommendation" to slurp
> packs and not falling back on commit walker.
>
> Thanks for the patch.
No problem; I had been wonderin
Dear diary, on Fri, Aug 12, 2005 at 01:21:46AM CEST, I got a letter
where Junio C Hamano <[EMAIL PROTECTED]> told me that...
> Petr Baudis <[EMAIL PROTECTED]> writes:
>
> > $ git-cat-file commit bf570303153902ec3d85570ed24515bcf8948848 | grep tree
> > tree 41f10531f1799bbb31a1e0f7652363154ce96f45
On Fri, 12 Aug 2005, Petr Baudis wrote:
> Dear diary, on Fri, Aug 12, 2005 at 01:21:46AM CEST, I got a letter
> where Junio C Hamano <[EMAIL PROTECTED]> told me that...
> > Petr Baudis <[EMAIL PROTECTED]> writes:
> >
> > > $ git-cat-file commit bf570303153902ec3d85570ed24515bcf8948848 | grep tree
On Fri, 2005-08-12 at 03:08 +0200, Petr Baudis wrote:
> Dear diary, on Fri, Aug 12, 2005 at 02:54:13AM CEST, I got a letter
> where Pavel Roskin <[EMAIL PROTECTED]> told me that...
> > Hi, Petr!
>
> Hi,
>
> > Unfortunately, my latest revision of cg-clean has "committed suicide"
> > just when I wa
Daniel Barkalow <[EMAIL PROTECTED]> writes:
> Petr Baudis <[EMAIL PROTECTED]> writes:
>> Yes, but cg-clone doesn't - it naively depended on the core git tools
>> actually, er.. working. ;-)
Sorry about that. I used to have a wrapper to deal with packs
around http-pull before Daniel's pack enhanc
I wrote:
> + * F
> + * / \
> + *E A D
> + * \ / /
> + * B /
> + * \ /
> + *C
> + *
> + * First we push E and F to list to be processed. E gets bit 1
> + * and F gets bit 2. The list beco
44 matches
Mail list logo
