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

Confused, need help to understand 'feature branch workflow' using subrepo #643

Open
duaneellissd opened this issue Dec 10, 2024 · 1 comment

Comments

@duaneellissd
Copy link

So I'm trying to understand how to use subrepo and I'm getting stuck and its not working.

The goal is this: I have two "PARENT" project, parent (MOM) and parent (DAD)
Both have or use common subrepo ALICE and subrepo BOB.
More concreate example:
mom=The application called MOM
alice=lib-protocol- a library of protocols used by MOM
bob=lib-hal - our hal layer drivers for the BOARD.

Say that I am working on/in PARENT project DAD - i need to add a feature most (90%) of my work will be in CHILD_BOB

My goal is to create a FEATURE branch called BOB
then modify some files in BOB, and I commit these files and PUSH these.

My expectation is this: The changes will appear in the BOB repo.

If/when I checkout MOM - and examine the CHILD_BOB - I would expect these new features to be present.

Or if I created a new UNCLE_LARRY - project, and he has CHILD_BOB as a subrepo, then UNCLE_LARRY should see/find the new feature (and/or feature-branch) in CHILD BOB

But this is not working or not doing what I expected it to do.

@admorgan
Copy link
Collaborator

If I am reading this correct this is how I would expect the transactions to look like

  1. git clone mom
  2. git clone dad
  3. cd dad
  4. vi bob/new_hardware.c
  5. git commit -a -m "Great new hardware support"
  6. git subrepo push bob
  7. cd ../mom
  8. git subrepo pull bob

This all assumes that mom and dad are both using the same branch of bob.

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

2 participants