lkml.org 
[lkml]   [2005]   [Apr]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: Re: Re: Re: Re: GIT license (Re: Re: Re: Re: Re: [ANNOUNCE] git-pasky-0.1)
    Dear diary, on Tue, Apr 12, 2005 at 11:50:48AM CEST, I got a letter
    where Petr Baudis <pasky@ucw.cz> told me that...
    > Dear diary, on Tue, Apr 12, 2005 at 10:39:40AM CEST, I got a letter
    > where Geert Uytterhoeven <geert@linux-m68k.org> told me that...
    > > On Tue, 12 Apr 2005, Petr Baudis wrote:
    > ..snip..
    > > > Basically, when you look at merge(1) :
    > > >
    > > > SYNOPSIS
    > > > merge [ options ] file1 file2 file3
    > > > DESCRIPTION
    > > > merge incorporates all changes that lead from file2 to file3
    > > > into file1.
    > > >
    > > > The only big problem is how to guess the best file2 when you give it
    > > > file3 and file1.
    > >
    > > That's either the point just before you started modifying the file, or your
    > > last merge point. Sounds simple, but if your SCM system doesn't track merges,
    > > your SOL...
    >
    > Well, yes, but the last merge point search may not be so simple:
    >
    > A --1---2----6---7
    > B \ `-4-. /
    > C `-3-----5'
    >
    > Now, when at 7, your last merge point is not 1, but 2.

    ...and this is obviously wrong, sorry. You would lose 3 this way.

    --
    Petr "Pasky" Baudis
    Stuff: http://pasky.or.cz/
    98% of the time I am right. Why worry about the other 3%.
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2005-04-12 22:48    [W:2.390 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site