Re: Support for a series of patches, i.e. patchset or changeset?

2012-11-10 Thread Enrico Weigelt
snip yet another idea: you coud always put your patchsets into separate branches, rebase them ontop target branch before merging, and then do an non-ff-merge, which will make the history look like: * merged origin/feature_foo |\ | * first preparation fo feature foo | * part a | * part b |/ *

Re: Support for a series of patches, i.e. patchset or changeset?

2012-11-08 Thread Jeff King
On Tue, Nov 06, 2012 at 08:58:35AM +0800, Eric Miao wrote: So, then the question is: What do you know/have? Is your patch the output of git format-patch, git diff, or just some sort of diff without any git information? That doesn't matter, all the info can be obtained from the SHA1 id,

Re: Support for a series of patches, i.e. patchset or changeset?

2012-11-08 Thread Eric Miao
On Fri, Nov 9, 2012 at 3:09 AM, Jeff King p...@peff.net wrote: On Tue, Nov 06, 2012 at 08:58:35AM +0800, Eric Miao wrote: So, then the question is: What do you know/have? Is your patch the output of git format-patch, git diff, or just some sort of diff without any git information? That

Re: Support for a series of patches, i.e. patchset or changeset?

2012-11-05 Thread Michael J Gruber
Eric Miao venit, vidit, dixit 05.11.2012 03:26: Hi All, Does anyone know if git has sort of support for a series of patches, i.e. a patchset or changeset? So whenever we know the SHA1 id of a single patch/commit, we know the patchset it belongs to. This is normal when we do big changes and

Re: Support for a series of patches, i.e. patchset or changeset?

2012-11-05 Thread Eric Miao
The problem is, most cases we have no idea of the base rev1, and commit rev2 which it's leading up to. E.g. for a single patch which is between commit rev1..rev2, how do we find out rev1 and rev2. On Mon, Nov 5, 2012 at 9:39 PM, Michael J Gruber g...@drmicha.warpmail.net wrote: Eric Miao venit,

Re: Support for a series of patches, i.e. patchset or changeset?

2012-11-05 Thread Michael J Gruber
Eric Miao venit, vidit, dixit 05.11.2012 15:12: The problem is, most cases we have no idea of the base rev1, and commit rev2 which it's leading up to. E.g. for a single patch which is between commit rev1..rev2, how do we find out rev1 and rev2. So, then the question is: What do you know/have?

Re: Support for a series of patches, i.e. patchset or changeset?

2012-11-05 Thread Eric Miao
On Mon, Nov 5, 2012 at 10:40 PM, Michael J Gruber g...@drmicha.warpmail.net wrote: Eric Miao venit, vidit, dixit 05.11.2012 15:12: The problem is, most cases we have no idea of the base rev1, and commit rev2 which it's leading up to. E.g. for a single patch which is between commit rev1..rev2,

Re: Support for a series of patches, i.e. patchset or changeset?

2012-11-05 Thread Johannes Sixt
Am 11/6/2012 1:58, schrieb Eric Miao: On Mon, Nov 5, 2012 at 10:40 PM, Michael J Gruber g...@drmicha.warpmail.net wrote: Eric Miao venit, vidit, dixit 05.11.2012 15:12: The problem is, most cases we have no idea of the base rev1, and commit rev2 which it's leading up to. E.g. for a single

Re: Support for a series of patches, i.e. patchset or changeset?

2012-11-05 Thread Eric Miao
On Tue, Nov 6, 2012 at 2:39 PM, Johannes Sixt j.s...@viscovery.net wrote: Am 11/6/2012 1:58, schrieb Eric Miao: On Mon, Nov 5, 2012 at 10:40 PM, Michael J Gruber g...@drmicha.warpmail.net wrote: Eric Miao venit, vidit, dixit 05.11.2012 15:12: The problem is, most cases we have no idea of the

Re: Support for a series of patches, i.e. patchset or changeset?

2012-11-05 Thread Johannes Sixt
Am 11/6/2012 7:56, schrieb Eric Miao: On Tue, Nov 6, 2012 at 2:39 PM, Johannes Sixt j.s...@viscovery.net wrote: Am 11/6/2012 1:58, schrieb Eric Miao: E.g. when we merged a series of patches: [PATCH 00/08] [PATCH 01/08] ... [PATCH 08/08] How do we know this whole series after