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 tree I had
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 in
the
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 of a message
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 had
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
5 matches
Mail list logo
