Dear diary, on Wed, Jul 20, 2005 at 06:34:43AM CEST, I got a letter
where James Cloos <[EMAIL PROTECTED]> told me that...
> > "Petr" == Petr Baudis <[EMAIL PROTECTED]> writes:
>
> Petr> Huh. Well, you had to do uberweird things with your repository -
> Petr> why did you cg-seek at all? What Co
> "Petr" == Petr Baudis <[EMAIL PROTECTED]> writes:
Petr> Huh. Well, you had to do uberweird things with your repository -
Petr> why did you cg-seek at all? What Cogito version is it?
All I ever did was track and compile linus’ tree. IIRC, when the
first new tag was added after I cloned the
Dear diary, on Fri, Jul 15, 2005 at 06:12:48AM CEST, I got a letter
where James Cloos <[EMAIL PROTECTED]> told me that...
> Well, it wasn't as Ok as I first thought. There were several .rej and
> backup files as left behind by patch(1). cg update HEAD says: Branch
> already fully merged but Make
Well, it wasn't as Ok as I first thought. There were several .rej and
backup files as left behind by patch(1). cg update HEAD says: Branch
already fully merged but Makefile still says 2.6.12.
I'm cloning now to a remote uml and will try and rsync from there to
the laptop. Perhaps *that* will g
> "Darrin" == Darrin Thompson <[EMAIL PROTECTED]> writes:
Darrin> Now your merge should not be blocked. No?
I figured out what you meant after I sent that first reply, but waited
for update to finish to be sure it worked before replying again.
It took about thirty minutes, and claimed that I
On Thu, 2005-07-14 at 16:06 -0400, James Cloos wrote:
> > "Darrin" == Darrin Thompson <[EMAIL PROTECTED]> writes:
>
> JimC> cg-merge: merge blocked: seeked from master `
>
> Darrin> cg-seek master ?
>
> :; cg seek master
> On commit 514fd7fd01d378a7b5584c657d9807fc28f22079
Now your merg
> "Darrin" == Darrin Thompson <[EMAIL PROTECTED]> writes:
JimC> cg-merge: merge blocked: seeked from master `
Darrin> cg-seek master ?
:; cg seek master
On commit 514fd7fd01d378a7b5584c657d9807fc28f22079
-JimC
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body
On Thu, 2005-07-14 at 14:04 -0400, James Cloos wrote:
> I'm getting this on my clone of linus' tree:
>
> ,
> | cg-merge: merge blocked: seeked from master
> `
>
> I've not found a way past it.
cg-seek master ?
--
Darrin
-
To unsubscribe from this list: send the line "unsubscribe git"
I'm getting this on my clone of linus' tree:
,
| cg-merge: merge blocked: seeked from master
`
I've not found a way past it.
Is there an easy way, or do I have still yet another borked lk clone?
(Borked clones would be much less of an issue if I had more bandwidth
than disk space, but a
9 matches
Mail list logo
