The sound distributed version control system

#20 Fixing history (pull issues from previous clones of this repository)

Closed on November 10, 2020
fabian on November 9, 2020

Hi, sorry I broke the history of this repo with the change on #11 unu

Though, through testing there is an easy way of fixing it locally:

  • Cloning this repository into a local dir called pijul-brokenhistory
  • Creating a new empty repository called pijul-fixedhistory and pulling everything except SL52FT2SJFQMOA2H25WXCYJBY4Z4ATQOAEIGDQULLLNZGLTIL3IAC and 3EAIT2277UKYK2SGAWNR4GRP3IIJGMH6ANJ3JGBZMKNYRW7OOCVQC
  • copying all the files from pijul-brokenhistory into pijul-fixedhistory
  • recording changes with the same message as 3EAIT2277UKYK2SGAWNR4GRP3IIJGMH6ANJ3JGBZMKNYRW7OOCVQC

You are now on sync with this repository. Sorry for the breakage, hope this helps.

fabian added a change on November 9, 2020
This change could not be retrieved at the moment
DSJP3AKRL36FVM6NXQYPO35ZD7HZ42NPBGVQZDZRTZSZCJWH4LIAC
fabian on November 9, 2020

I uploaded this rebased changes in case they are useful to someone.

pmeunier on November 9, 2020

I’m sorry, there’s no need to rebase anything in Pijul, I don’t see any broken history when I try to clone (but that could be a bug on my side). What do you see exactly, and what were you expecting?

pmeunier on November 9, 2020

Oh, I see, you want to unrecord SL52FT… but 3EAIT… depends on it. That’s ok, don’t worry too much about it. SL52FT… is a small changefile anyway.

fabian on November 9, 2020

Hi @pmeunier, if you start from an empty repository and attempt to pull everything from this repository #11 causes an issue (since the changes it made don’t apply after fixing the newline hunk issue on #13 by 3EAIT2277UKYK2SGAWNR4GRP3IIJGMH6ANJ3JGBZMKNYRW7OOCVQC)

fabian on November 9, 2020

So, if you pull with a previous version before the 3EAIT2277UKYK2SGAWNR4GRP3IIJGMH6ANJ3JGBZMKNYRW7OOCVQC fix it succeds but ends in a weird state with missing newlines, but if you use something with 3EAIT2277UKYK2SGAWNR4GRP3IIJGMH6ANJ3JGBZMKNYRW7OOCVQC it doesn’t apply.

pmeunier on November 9, 2020

I can reproduce, but I’d rather fix the bugs rather than remove the changes from history.

fabian on November 9, 2020

Ok, I think the issue is that that change does not apply to its dependencies since the state is different between when it was recorded (one was erroneous) and after fixing the hunk issue.

Another example could be easily produced by altering the dependency hash. For example, changes A <- B <- C and altering the dependency of C to A such that it no longer applies.

fabian on November 9, 2020

Oh wait, just realized I have some conflicts on what I pushed to this channel.

pmeunier on November 10, 2020

I found the problem and fixed it in #PBRRM33RDMYMIZGJ4MOC2KCQQPV5S6J3HH4UXHOM43DCPC6OINRQC Thanks.

pmeunier closed this discussion on November 10, 2020