Feature #8618

Deal with the remaining branches' Git history and interdependencies

Added by intrigeri 2015-01-09 13:55:22 . Updated 2015-03-22 12:10:52 .

Status:
Resolved
Priority:
Normal
Assignee:
intrigeri
Category:
Infrastructure
Target version:
Tails_1.3.1
Start date:
2015-01-09
Due date:
% Done:

100%

Feature Branch:
Type of work:
Code
Blueprint:

https://tails.boum.org/blueprint/rewrite_Git_history/

Starter:
Affected tool:
Deliverable for:

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 Feature #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}'

Subtasks

Related issues

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

History

#1 Updated by intrigeri 2015-01-09 13:57:33

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

#2 Updated by intrigeri 2015-01-09 14:00:46

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

#3 Updated by intrigeri 2015-01-09 14:02:13

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

#4 Updated by intrigeri 2015-01-09 14:03:37

  • Target version set to Tails_1.3.2

#5 Updated by intrigeri 2015-01-09 14:23:53

#6 Updated by intrigeri 2015-01-09 14:27:04

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

#7 Updated by intrigeri 2015-01-09 14:28:11

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

#8 Updated by intrigeri 2015-01-09 14:34:51

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

#9 Updated by intrigeri 2015-01-09 14:35:02

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

#10 Updated by intrigeri 2015-02-21 14:38:33

  • Description updated

#11 Updated by intrigeri 2015-02-21 16:16:22

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

#12 Updated by intrigeri 2015-02-21 18:11:51

  • 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 Feature #8619 is completed), so perhaps actually no manual rebasing will be needed at all.

#13 Updated by intrigeri 2015-02-23 13:56:40

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

#14 Updated by intrigeri 2015-02-23 13:57:29

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

#15 Updated by intrigeri 2015-02-25 11:52:20

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

#16 Updated by intrigeri 2015-02-25 11:55:45

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

#17 Updated by BitingBird 2015-03-22 12:10:52

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