Re: [RFC] Importing from a patch-oriented SCM

2005-08-19 Thread Daniel Barkalow
On Fri, 19 Aug 2005, Martin Langhoff wrote: > On 8/19/05, Junio C Hamano <[EMAIL PROTECTED]> wrote: > > Martin Langhoff <[EMAIL PROTECTED]> writes: > > > > > If I remember correctly, Junio added some stuff in the merge & rebase > > > code that will identify if a particular patch has been seen and

Re: [RFC] Importing from a patch-oriented SCM

2005-08-19 Thread Martin Langhoff
On 8/19/05, Junio C Hamano <[EMAIL PROTECTED]> wrote: > Martin Langhoff <[EMAIL PROTECTED]> writes: > > > If I remember correctly, Junio added some stuff in the merge & rebase > > code that will identify if a particular patch has been seen and > > applied, and skip it even if it's a bit out of ord

Re: [RFC] Importing from a patch-oriented SCM

2005-08-19 Thread Johannes Schindelin
Hi, On Fri, 19 Aug 2005, Martin Langhoff wrote: > Each patchset has a unique identifier, and can carry metadata with the > identifiers of the patches it "includes". If you are using gnu arch, > when you merge across branches, it'll know to skip a particular > patchset if it has been applied alrea

Re: [RFC] Importing from a patch-oriented SCM

2005-08-19 Thread Junio C Hamano
Martin Langhoff <[EMAIL PROTECTED]> writes: > If I remember correctly, Junio added some stuff in the merge & rebase > code that will identify if a particular patch has been seen and > applied, and skip it even if it's a bit out of order. But I don't know I think you are talking about git-patch-id

[RFC] Importing from a patch-oriented SCM

2005-08-19 Thread Martin Langhoff
I am drafting an import script to turn a GNU Arch into a GIT archive. Importing the branches and commits increamentally is reasonably straightforward -- or so it seems so far. Note: the repository manipulation is based on cvsimport -- so my knowledge of the git repo internals is still pertty close