Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Proposal: rebase on primary upstream #43

Open
blaggacao opened this issue Dec 19, 2019 · 2 comments
Open

Proposal: rebase on primary upstream #43

blaggacao opened this issue Dec 19, 2019 · 2 comments

Comments

@blaggacao
Copy link

An optomized workflow would be in my opinion represented as follows:

...
origin: <url>
upstream: 
  url: <url>
  ref: <ref>
  rebase: <default: true>  # target will be rebased on upstream, first
remotes:
  - name: <name>
    url: <url>
    merge:
       - <ref>
       - <ref>
target: <branchname on local & origin>
...
@blaggacao
Copy link
Author

@dataclass
class TargetDirectory(DataClassYAMLMixin):
    name: GitSubmoduleSpec


@dataclass
class GitSubmoduleSpec(DataClassYAMLMixin):
    origin: str
    upstream: Upstream
    remotes: List[Remote] = field(default_factory=list)
    targets: List[Target] = field(default_factory=list)
    postprocess: List[str] = field(default_factory=list)

@dataclass
class Target(DataClassYAMLMixin):
    name: str
    patches: List[Patch] = field(default_factory=list)

@dataclass
class Patch(DataClassYAMLMixin):
    remote: str
    refs: List[str] = field(default_factory=list)


@dataclass
class Upstream(DataClassYAMLMixin):
    url: str
    ref: str
    rebase: bool = True


@dataclass
class Remote(DataClassYAMLMixin):
    name: str
    url: str

@blaggacao
Copy link
Author

blaggacao commented Dec 19, 2019

Why targets? -> maintaining a set of anxilliary pull requests against upstream in origin (lower the cost of contribution...)

First target, hence would be the locally checked out one...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant