[lkml]   [2005]   [Apr]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: Linux 2.6.12-rc3

> On Sat, 23 Apr 2005, Pavel Machek wrote:
> >
> > Unfortunately first merge will make it practically unusable :-(.
> No, quite the reverse. If I merge from you, and you use my commit ID as
> the "base" point, it will work again.

I meant "every time I merge from you, new commit with message 'merge from linus' and
big ugly diff is attached.

> But yes, if you actually send the result as _patches_ to me, then the
> commit objects I create will be totally separate from the commit objects
> you had in your tree, and "git-export" will continue to export your old
> stale entries since they won't show up as already being in my tree.
> The point being, that there is a big difference between a proper merge
> (with history etc merged) and just sending me the patches in your tree.

Could we add some kind off "This-changeset-obsoletes: <sha1>" header?
That would allow me to send patches by hand and still make the SCM do the
right thing during merge.

Alternatively I should just get public rsync-able space somewhere...
Would be willing to add people/pavel?

64 bytes from icmp_seq=28 ttl=51 time=448769.1 ms

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to
More majordomo info at
Please read the FAQ at

 \ /
  Last update: 2005-04-23 13:25    [W:0.102 / U:1.920 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site