Dear all, I’m sorry to say that obviously some commits to the TEIC/TEI dev branch got erroneously overwritten by subsequent commits. I just realized when I looked at the current header chapter and found the modifications I made to the correspDesc section missing. There were a bunch of changes (for a list see issue #1350) and obviously they got lost during the "merge branch 'dev' of github.com:TEIC/TEI into dev“ by some hcayless (Jan 9, commit 6bc49d05f1b0d9385c10563e843c3baeed557591). It’s not clear to me how that happened, especially since Syd’s commit (c5e0adb713042c024bf64d93a8bf4291ed4f875f) came between mine and Hugh’s while his changes to the header chapter were added correctly (and didn’t overwrite mine)?! Peter
Looks like
https://github.com/TEIC/TEI/commit/ff9c1e90a320651b2a76b83662953203f66c24bc
might be the one at fault. Which is my own stupid fault. Apologies. What
was the commit(s) where you made the changes? Do we need a 3.0.1 release to
fix it? If it's just prose that should be low-impact.
On Wed, Apr 6, 2016 at 5:52 AM, Peter Stadler
Dear all,
I’m sorry to say that obviously some commits to the TEIC/TEI dev branch got erroneously overwritten by subsequent commits. I just realized when I looked at the current header chapter and found the modifications I made to the correspDesc section missing. There were a bunch of changes (for a list see issue #1350) and obviously they got lost during the "merge branch 'dev' of github.com:TEIC/TEI into dev“ by some hcayless (Jan 9, commit 6bc49d05f1b0d9385c10563e843c3baeed557591).
It’s not clear to me how that happened, especially since Syd’s commit (c5e0adb713042c024bf64d93a8bf4291ed4f875f) came between mine and Hugh’s while his changes to the header chapter were added correctly (and didn’t overwrite mine)?!
Peter
-- tei-council mailing list tei-council@lists.tei-c.org http://lists.lists.tei-c.org/mailman/listinfo/tei-council
PLEASE NOTE: postings to this list are publicly archived
well, yes, it’s only prose … Anyone else missing some stuff?! Best Peter
Am 06.04.2016 um 15:26 schrieb Hugh Cayless
: Looks like https://github.com/TEIC/TEI/commit/ff9c1e90a320651b2a76b83662953203f66c24bc might be the one at fault. Which is my own stupid fault. Apologies. What was the commit(s) where you made the changes? Do we need a 3.0.1 release to fix it? If it's just prose that should be low-impact.
On Wed, Apr 6, 2016 at 5:52 AM, Peter Stadler
wrote: Dear all,
I’m sorry to say that obviously some commits to the TEIC/TEI dev branch got erroneously overwritten by subsequent commits. I just realized when I looked at the current header chapter and found the modifications I made to the correspDesc section missing. There were a bunch of changes (for a list see issue #1350) and obviously they got lost during the "merge branch 'dev' of github.com:TEIC/TEI into dev“ by some hcayless (Jan 9, commit 6bc49d05f1b0d9385c10563e843c3baeed557591).
It’s not clear to me how that happened, especially since Syd’s commit (c5e0adb713042c024bf64d93a8bf4291ed4f875f) came between mine and Hugh’s while his changes to the header chapter were added correctly (and didn’t overwrite mine)?!
Peter
-- tei-council mailing list tei-council@lists.tei-c.org http://lists.lists.tei-c.org/mailman/listinfo/tei-council
PLEASE NOTE: postings to this list are publicly archived
-- tei-council mailing list tei-council@lists.tei-c.org http://lists.lists.tei-c.org/mailman/listinfo/tei-council
PLEASE NOTE: postings to this list are publicly archived
See discussion at end of issue #1267 for another mysteriously lost commit. On 06/04/16 11:52, Peter Stadler wrote:
Dear all,
I’m sorry to say that obviously some commits to the TEIC/TEI dev branch got erroneously overwritten by subsequent commits. I just realized when I looked at the current header chapter and found the modifications I made to the correspDesc section missing. There were a bunch of changes (for a list see issue #1350) and obviously they got lost during the "merge branch 'dev' of github.com:TEIC/TEI into dev“ by some hcayless (Jan 9, commit 6bc49d05f1b0d9385c10563e843c3baeed557591).
It’s not clear to me how that happened, especially since Syd’s commit (c5e0adb713042c024bf64d93a8bf4291ed4f875f) came between mine and Hugh’s while his changes to the header chapter were added correctly (and didn’t overwrite mine)?!
Peter
participants (3)
-
Hugh Cayless
-
Lou Burnard
-
Peter Stadler