Messages in this thread | | | Subject | Re: BitBucket: GPL-ed KitBeeper clone | Date | Sat, 15 Mar 2003 20:39:24 -0400 | From | Horst von Brand <> |
| |
Pavel Machek <pavel@ucw.cz> dijo:
[...]
> Some kind of better-patch is badly needed. > > What kind of data would have to be in soft-changeset? > * unique id of changeset
If you want...
> * unique id of previous changeset
What is "previous"?
> (two previous if it is merge)
And if they are merges themselves? Or if it is a 3-way merge? Etc? How do I get the original patches (if wanted)?
> ? or would it be better to have here > whole path to first change? > * commit comment
Right.
> * for each file: > ** diff -u of change > ** file's unique id
What is that? If I moved the file away and created a new one? Other moving around stuff?
> ** in case of rename: new name (delete is rename to special dir) > ** in case of chmod/chown: new permissions > ** per-file comment
Much more important: How to merge a conflicting patch in sanely? This is perhaps the worst stumbling block on plain patches. -- Dr. Horst H. von Brand User #22616 counter.li.org Departamento de Informatica Fono: +56 32 654431 Universidad Tecnica Federico Santa Maria +56 32 654239 Casilla 110-V, Valparaiso, Chile Fax: +56 32 797513 - 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/
| |