Stephen,
If I know a linux-next tag, say next-20110928, how can I extract the
Linus tag you used to start that set of merges for linux-next for?
That is, I am assuming you base your daily linux-next merges on that
day's latest Linus's rc cycle (not just Linus's master tag of that
day). Is that right? If so how can I get that tag?
For example for next-20110928 I see in Next/quilt-import.log:
diff --git a/Next/quilt-import.log b/Next/quilt-import.log
new file mode 100644
index 0000000..a5c7017
--- /dev/null
+++ b/Next/quilt-import.log
@@ -0,0 +1,12 @@
+Importing hexagon based on v3.1-rc6
+Unchanged quilt series hexagon
+Importing i2c based on 3.1-rc4
+Unchanged quilt series i2c
+Importing jdelvare-hwmon based on 3.1-rc4
+Unchanged quilt series jdelvare-hwmon
+Importing kernel-doc based on 3.1-rc3
+Unchanged quilt series kernel-doc
+Importing rr based on v3.1-rc2-188-g6719db6
+Unchanged quilt series rr
+Importing device-mapper based on v3.1-rc7
+Unchanged quilt series device-mapper
So I see some development trees were based circa v3.1 on different rc
cycles, but its unclear to me which one your linux-next was based on
prior to the merge of git trees / quilt trees.
Luis
Hi Luis,
On Thu, 8 Dec 2011 13:39:16 -0800 "Luis R. Rodriguez" <[email protected]> wrote:
>
> If I know a linux-next tag, say next-20110928, how can I extract the
> Linus tag you used to start that set of merges for linux-next for?
> That is, I am assuming you base your daily linux-next merges on that
> day's latest Linus's rc cycle (not just Linus's master tag of that
> day). Is that right? If so how can I get that tag?
In each linux-next, there is a file called Next/SHA1s, and in there is a
SHA1 for "origin" - that is the point in Linus' tree that I started for
that day. I just use the latest available version of Linus' tree each
day.
> For example for next-20110928 I see in Next/quilt-import.log:
For the quilt series, the owner of the series puts a BASE or NEXT_BASE
comment in the series to tell me what their series is based on. I import
each quilt series staring from that base into a branch and then merge
that branch.
For the git trees, I just fetch and merge them.
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/
On Thu, Dec 8, 2011 at 1:57 PM, Stephen Rothwell <[email protected]> wrote:
> Hi Luis,
>
> On Thu, 8 Dec 2011 13:39:16 -0800 "Luis R. Rodriguez" <[email protected]> wrote:
>>
>> If I know a linux-next tag, say next-20110928, how can I extract the
>> Linus tag you used to start that set of merges for linux-next for?
>> That is, I am assuming you base your daily linux-next merges on that
>> day's latest Linus's rc cycle (not just Linus's master tag of that
>> day). Is that right? If so how can I get that tag?
>
> In each linux-next, there is a file called Next/SHA1s, and in there is a
> SHA1 for "origin" - that is the point in Linus' tree that I started for
> that day. I just use the latest available version of Linus' tree each
> day.
>
>> For example for next-20110928 I see in Next/quilt-import.log:
>
> For the quilt series, the owner of the series puts a BASE or NEXT_BASE
> comment in the series to tell me what their series is based on. I import
> each quilt series staring from that base into a branch and then merge
> that branch.
>
> For the git trees, I just fetch and merge them.
Thanks for all the details!
Last question, do you do merge conflicts manually? I was also trying
to see if I can simulate a linux-next merge myself to see what you do
but I didn't see the scripts you use, any pointers would be
appreciated.
Luis