From: "Shawn O. Pearce" <spearce@spearce.org>
To: Andreas Ericsson <ae@op5.se>
Cc: Junio C Hamano <gitster@pobox.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: git/lib and git/git-gui/lib merge mis-hap?
Date: Sat, 1 Nov 2008 13:22:01 -0700 [thread overview]
Message-ID: <20081101202201.GA15463@spearce.org> (raw)
In-Reply-To: <490CAE40.4060300@op5.se>
Andreas Ericsson <ae@op5.se> wrote:
> Settling down to get some libgit2 hacking done (adding build-rules
> to git.git), I noticed that there's a file in git.git called
> lib/remote_add.tcl, which looks as if it belongs in git-gui/lib.
>
> I don't know how this happened, but since I assume it's subtree
> merged (thus requiring more work to correct than a simple patch),
> it would be nifty if it could get corrected so as to make space
> for the up-and-coming git library :-)
That was a bad merge of git-gui on my part. I thought it was fixed.
It only happened in next, and was there only for a day before
someone pointed it out to me, and I fixed it in the tree.
FWIW, "git mv lib/remote_add.tcl git-gui/lib" is all you need to
fix it. There's nothing special about the subtree merge.
--
Shawn.
next prev parent reply other threads:[~2008-11-01 20:23 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-01 19:30 git/lib and git/git-gui/lib merge mis-hap? Andreas Ericsson
2008-11-01 20:22 ` Shawn O. Pearce [this message]
2008-11-01 22:46 ` Junio C Hamano
2008-11-01 23:14 ` Shawn O. Pearce
2008-11-03 10:27 ` Andreas Ericsson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20081101202201.GA15463@spearce.org \
--to=spearce@spearce.org \
--cc=ae@op5.se \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).