On Tue, Apr 19, 2005 at 04:59:18PM -0700, Linus Torvalds wrote:
>
> However, it definitely wouldn't be useful for _me_. The whole thing that
> I'm after is to allow painless merging of distributed work. If I have to
> merge one patch at a time, I'd much rather see people send me patches
> directly
We can just have a baseline file contain all the commit objects.
Then have the git "download on demand". The problem with diff
package is that I it is harder to merge with more than one diff.
I bet 90% of the time people sync to the repository head first
want to check out the last bits. And maybe
On Sat, Apr 16, 2005 at 07:43:27PM +0200, Petr Baudis wrote:
> Dear diary, on Sat, Apr 16, 2005 at 07:04:31PM CEST, I got a letter
> where Linus Torvalds <[EMAIL PROTECTED]> told me that...
> > So I'd _almost_ suggest just starting from a clean slate after all.
> > Keeping the old history around,
On Fri, Apr 15, 2005 at 12:43:47AM -0700, Junio C Hamano wrote:
> >>>>> "CL" == Christopher Li <[EMAIL PROTECTED]> writes:
>
> CL> Is that SHA1 for tree or the file object?
>
> I am talking about a single file here.
>
Then do you emit the
On Thu, Apr 14, 2005 at 05:58:25PM -0700, Junio C Hamano wrote:
>
> I do like, however, the idea of separating the step of doing any
> checkout/merge etc. and actually doing them. So the command set
> of parse-your-output needs to be defined. Based on what I have
> done so far, it would consist
BTW, I am not competing with Junio script. If that is the way
we all agree on. It is should be very easy for Junio to fix his
perl script. right?
Chris
On Thu, Apr 14, 2005 at 04:37:17PM -0400, Christopher Li wrote:
> Is that some thing you want to see? Maybe clean up the error print
Is that some thing you want to see? Maybe clean up the error printing.
Chris
--- /dev/null 2003-01-30 05:24:37.0 -0500
+++ merge.py2005-04-14 16:34:39.0 -0400
@@ -0,0 +1,76 @@
+#!/usr/bin/env python
+
+import re
+import sys
+import os
+from pprint import pprint
+
+def get_t
On Fri, Apr 15, 2005 at 01:31:59AM +0200, Petr Baudis wrote:
> > I am just trying to follow my understanding of what Linus
> > wanted. One of the guiding principle is to do as much things as
> > in dircache without ever checking things out or touching working
> > files unnecessarily.
>
> I'm just
Hi Junio,
I think if the merge tree belong to plumbing, you can do
even less in the merge.perl. You can just print out the
instruction for the upper level SCM what to to without
actually doing it yourself.
So you don't have to do touch anything in the tree.
That is the way I use in my previous py
On Thu, Apr 14, 2005 at 11:12:35AM -0700, Junio C Hamano wrote:
> > "PB" == Petr Baudis <[EMAIL PROTECTED]> writes:
>
> At this moment in the script, we have run "read-tree" the
> ancestor so the dircache has the original. %tree0 and %tree1
> both did not touch the path ($_ here) so it is the
10 matches
Mail list logo
