On Wed, Oct 1, 2008 at 3:32 PM, Stéphane Glondu <[EMAIL PROTECTED]> wrote:
> Imagine I maintain a topic branch in "feature" based on branch
> "upstream", and my "integration" (the one you tag) branch is "build":
>
> --A---B---C- (upstream)
> \ \ \
>
On Wed, Oct 01 2008, Stéphane Glondu wrote:
> Teemu Ikonen wrote:
>> First, find a path from tagged release commit in master to the commit
>> in topgit branch patch/x preceding the commit in master where patch/x
>> was last merged in. Let's call this commit Px. Next, starting from Px,
>> find the
On Wed, Oct 01 2008, martin f krafft wrote:
> also sprach Manoj Srivastava <[EMAIL PROTECTED]> [2008.09.30.2344 +0200]:
>> Hmm. In my case, the integration and build branches are the same
>> (master, for me). It would be slightly awkward to put stuff into a
>> ./debian/patches for me, si
Teemu Ikonen wrote:
> First, find a path from tagged release commit in master to the commit
> in topgit branch patch/x preceding the commit in master where patch/x
> was last merged in. Let's call this commit Px. Next, starting from Px,
> find the commit in top-bases/patch/x preceding the last merg
also sprach Manoj Srivastava <[EMAIL PROTECTED]> [2008.09.30.2344 +0200]:
> Hmm. In my case, the integration and build branches are the same
> (master, for me). It would be slightly awkward to put stuff into a
> ./debian/patches for me, since ./debian is a submodule, and thus a
> differe
On Tue, Sep 30 2008, martin f krafft wrote:
> also sprach Manoj Srivastava <[EMAIL PROTECTED]> [2008.09.30.2131 +0200]:
>> At this point, pre-topgit, that is what my tags do:
>> I tag the ./debian/ branch and the integration branch. Checking out the
>> tag on the integration branch, and
On Tue, Sep 30 2008, martin f krafft wrote:
> also sprach Manoj Srivastava <[EMAIL PROTECTED]> [2008.09.30.2131 +0200]:
>> At this point, pre-topgit, that is what my tags do:
>> I tag the ./debian/ branch and the integration branch. Checking out the
>> tag on the integration branch, and
On Tue, Sep 30, 2008 at 10:46 PM, martin f krafft <[EMAIL PROTECTED]> wrote:
> also sprach Teemu Ikonen <[EMAIL PROTECTED]> [2008.09.30.1222 +0200]:
>> First, find a path from tagged release commit in master to the
>> commit in topgit branch patch/x preceding the commit in master
>> where patch/x w
also sprach Manoj Srivastava <[EMAIL PROTECTED]> [2008.09.30.2131 +0200]:
> At this point, pre-topgit, that is what my tags do:
> I tag the ./debian/ branch and the integration branch. Checking out the
> tag on the integration branch, and installing the submodules, are all
> you need to
also sprach Manoj Srivastava <[EMAIL PROTECTED]> [2008.09.30.2131 +0200]:
> At this point, pre-topgit, that is what my tags do:
> I tag the ./debian/ branch and the integration branch. Checking out the
> tag on the integration branch, and installing the submodules, are all
> you need to
also sprach Teemu Ikonen <[EMAIL PROTECTED]> [2008.09.30.1222 +0200]:
> First, find a path from tagged release commit in master to the
> commit in topgit branch patch/x preceding the commit in master
> where patch/x was last merged in. Let's call this commit Px. Next,
> starting from Px, find the c
also sprach Stefano Zacchiroli <[EMAIL PROTECTED]> [2008.09.30.2104 +0200]:
> OK, my bad than, I didn't know this (rather gory) detail. I thought it
> was just a problem of not being able to create the exact
> representation (e.g., to preserve checksums of the source package), I
> didn't get that t
On Tue, Sep 30, 2008 at 12:22:03PM +0200, Teemu Ikonen wrote:
> The obvious, although perhaps inelegant way to solve the storage of
> the released debian source would be to modify pristine-tar to work
> with deb-source packages and store them in a branch of their own,
> maybe called "released-deb"
On Tue, Sep 30, 2008 at 10:42:37AM +0200, martin f krafft wrote:
> > who cares if you won't be able to recreate the exactly same
> > package?
> Because the topgit branches you used to create the stable package
> cannot be used anymore to create the patches that went into the
> stable package.
OK,
On Tue, Sep 30 2008, martin f krafft wrote:
> also sprach Stefano Zacchiroli <[EMAIL PROTECTED]> [2008.09.30.0932 +0200]:
>> Hence, I see no need of versioning the patch series. Having just
>> the last series, most likely in the Debian source package, would
>> be enough.
> I always thought the po
Teemu Ikonen wrote:
> Update the current topic branch wrt. changes in the branches
> it depends on and remote branches.
> This is performed in two phases - first,
> changes within the dependencies are merged to the base,
> then the base is merged into the topic branch.
On Tue, Sep 30, 2008 at 1:28 PM, Stéphane Glondu <[EMAIL PROTECTED]> wrote:
> Teemu Ikonen wrote:
>> AFAIK, all branches in git are "just references", and branch names are
>> not stored in commit objects. The proposed program would have to do a
>> preliminary pass through the revision graph startin
Teemu Ikonen wrote:
> AFAIK, all branches in git are "just references", and branch names are
> not stored in commit objects. The proposed program would have to do a
> preliminary pass through the revision graph starting from the branch
> heads (patch/x and top-bases/patch/x) and tag all the commits
On Tue, Sep 30, 2008 at 12:45 PM, Stéphane Glondu <[EMAIL PROTECTED]> wrote:
> Teemu Ikonen wrote:
>> First, find a path from tagged release commit in master to the commit
>> in topgit branch patch/x preceding the commit in master where patch/x
>> was last merged in. Let's call this commit Px. Next
Teemu Ikonen wrote:
> The obvious, although perhaps inelegant way to solve the storage of
> the released debian source would be to modify pristine-tar to work
> with deb-source packages and store them in a branch of their own,
> maybe called "released-deb" or similar. The storage overhead for this
On Tue, Sep 30, 2008 at 10:02 AM, martin f krafft <[EMAIL PROTECTED]> wrote:
> I always thought the point of tagging commits in the VCS was to be
> able to recreate pristine Debian source packages, no? Why do we
> bother tagging packages debian/1.0-1 if the tag cannot be used to
> actually obtain t
also sprach Stefano Zacchiroli <[EMAIL PROTECTED]> [2008.09.30.1036 +0200]:
> [ unrelated: is the list configured to not deliver a message Cc-ed
> to a subscriber also via the list?
This is a per-user setting in Mailman.
> Please avoid Cc-ing me, since the result is that I receive the
> message o
[ unrelated: is the list configured to not deliver a message Cc-ed to
a subscriber also via the list? Please avoid Cc-ing me, since the
result is that I receive the message only in my INBOX and (I guess due
to the setting above) without a List-Id header ... ]
On Tue, Sep 30, 2008 at 10:02:34AM +02
23 matches
Mail list logo