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

notes are lost when fetching from a new repo #58

Open
mnauw opened this issue Jul 2, 2016 · 2 comments
Open

notes are lost when fetching from a new repo #58

mnauw opened this issue Jul 2, 2016 · 2 comments

Comments

@mnauw
Copy link
Contributor

mnauw commented Jul 2, 2016

Since a new repo does not yet have last-note info, the notes commit for fast-import does not mention a from mark, and so it starts a whole new hierarchy, thereby losing the existing notes (holding revision info from repos fetched so far).

Fix coming up that avoids using the last-note info altogether, and so prevents this from happening.

mnauw added a commit to mnauw/git-remote-hg that referenced this issue Jul 2, 2016
mnauw added a commit to mnauw/git-remote-hg that referenced this issue Aug 1, 2016
mnauw added a commit to mnauw/git-remote-hg that referenced this issue Aug 13, 2016
@mnauw
Copy link
Contributor Author

mnauw commented Aug 20, 2016

It should also be noted (no pun intended ;-) ) that the above fixes actually no longer use the last_note metadata that is tracked in marks-hg. That is, last_note is still updated for backwards compatibility, but now git-remote-hg no longer has to rely on it to ensure proper updating of notes. Instead it makes git-fast-import simply continue on the current refs/notes/hg ref.

@felipec
Copy link
Owner

felipec commented Jun 4, 2019

Well, that's one way of doing it.

To me this is more of a hack, and while I could certainly apply a patch like this, I would like to maintain them separately from the main branch, to eventually remove them.

There should be a way to improve the core so this isn't needed.

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

No branches or pull requests

2 participants