Project

General

Profile

Feature #8618

Feature #6277: Rewrite the tails-live.git history

Deal with the remaining branches' Git history and interdependencies

Added by intrigeri almost 5 years ago. Updated over 4 years ago.

Status:
Resolved
Priority:
Normal
Assignee:
Category:
Infrastructure
Target version:
Start date:
01/09/2015
Due date:
% Done:

100%

Feature Branch:
Type of work:
Code
Starter:
Affected tool:

Description

After the first test run of history rewriting: survey the branches that are left, identify how well their history needs to be kept, if at all, rebase each remaining topic branch on top of the current main branch it is based upon; if needed, preserve more history relationships between branches that what rebasing above alone would do.

To work on this without waiting for #8617 and for the first trial rewrite, one can list the branches that have not been merged into devel this way:

git checkout devel && git branch -r --no-merged \
  | perl -n -E 'if (m,^\s+origin/,) { s,^(\s+origin/),, ; print}'

Related issues

Blocked by Tails - Feature #8619: Do a trial rewrite of all branches and tags Resolved 01/09/2015 02/24/2015
Blocks Tails - Feature #8629: Replace rewritten (unsigned) Git tags with signed ones Resolved 01/09/2015

History

#1 Updated by intrigeri almost 5 years ago

  • Blocked by Feature #7221: Write a script that deletes old merged Git branches added

#2 Updated by intrigeri almost 5 years ago

  • Blocked by Feature #8619: Do a trial rewrite of all branches and tags added

#3 Updated by intrigeri almost 5 years ago

  • Blocks Feature #8620: Adjust the Git repository rewrite process as needed added

#4 Updated by intrigeri almost 5 years ago

  • Target version set to Tails_1.3.2

#5 Updated by intrigeri almost 5 years ago

  • Parent task changed from #8617 to #6277

#6 Updated by intrigeri almost 5 years ago

  • Blocked by deleted (Feature #8619: Do a trial rewrite of all branches and tags)

#7 Updated by intrigeri almost 5 years ago

  • Blocks deleted (Feature #8620: Adjust the Git repository rewrite process as needed)

#8 Updated by intrigeri almost 5 years ago

  • Blocks Feature #8620: Adjust the Git repository rewrite process as needed added

#9 Updated by intrigeri almost 5 years ago

  • Blocked by Feature #8619: Do a trial rewrite of all branches and tags added

#10 Updated by intrigeri over 4 years ago

  • Description updated (diff)

#11 Updated by intrigeri over 4 years ago

  • Blueprint set to https://tails.boum.org/blueprint/rewrite_Git_history/

#12 Updated by intrigeri over 4 years ago

  • Status changed from Confirmed to In Progress
  • % Done changed from 0 to 10

Sent list of branches to delete/rebase/whatever to tails-dev@ for review.

Apparently, the repo created by git filter-branch preserves relationships between branches just fine (to be confirmed once #8619 is completed), so perhaps actually no manual rebasing will be needed at all.

#13 Updated by intrigeri over 4 years ago

  • Blocks deleted (Feature #8620: Adjust the Git repository rewrite process as needed)

#14 Updated by intrigeri over 4 years ago

  • Blocks Feature #8629: Replace rewritten (unsigned) Git tags with signed ones added

#15 Updated by intrigeri over 4 years ago

  • Blocked by deleted (Feature #7221: Write a script that deletes old merged Git branches)

#16 Updated by intrigeri over 4 years ago

  • Status changed from In Progress to Resolved
  • % Done changed from 10 to 100

#17 Updated by BitingBird over 4 years ago

  • Target version changed from Tails_1.3.2 to Tails_1.3.1

Also available in: Atom PDF