Is my expectation wrong?
-JimC
--
James Cloos OpenPGP: 0x997A9F17ED7DAEA6
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
for the openaxiom fork.)
And there is a high-energy physics package still under development
with code going back to the '50s. I'm pretty sure they moved to a
vcs sometime in the last decade or two. :)
-JimC
--
James Cloos OpenPGP: 1024D/ED7DAEA6
--
To unsubscribe from thi
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
> "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
> "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
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
> "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
> "Matthias" == Matthias Urlichs <[EMAIL PROTECTED]> writes:
Matthias> Paths in SVN are usually prefixed "/trunk/" (main branch) or
Matthias> "/branches/foo/" (branch foo); tagging is done by creating
Matthias> "/tags/bar", with the trunk (or branch) revision it is
Matthias> pointing to as its
8 matches
Mail list logo
