Hi, Martin Langhoff wrote:
> this one is the
> most likely one to be from a bug in cvsps or the cvsimport logic.
That's not a bug in the import logic, just a failure of the CVS-merging
person to be consistent. (Which is hardly news. :-/ )
--
Matthias Urlichs | {M:U} IT Design @ m-u-it.de
On 8/16/05, Sven Verdoolaege <[EMAIL PROTECTED]> wrote:
> On Tue, Aug 16, 2005 at 10:35:27PM +1200, Martin Langhoff wrote:
> > +
> > +sub get_headref($$) {
>
> If you want to check whether a ref is valid, then
> it is better to use git-rev-parse...
We are reading/writing directly to .git/refs/hea
On Tue, Aug 16, 2005 at 10:35:27PM +1200, Martin Langhoff wrote:
> +
> +sub get_headref($$) {
If you want to check whether a ref is valid, then
it is better to use git-rev-parse...
> +my $name= shift;
> +my $git_dir = shift;
> +my $sha;
> +
> +if (open(C,"$git_dir/refs/he
[PATCH] Add merge detection to git-cvsimport
Added -m and -M flags for git-cvsimport to detect merge commits in cvs.
While this trusts the commit message, in repositories where merge commits
indicate 'merged from FOOBRANCH' the import works surprisingly well.
Even if some merges fr
4 matches
Mail list logo