4 ms·

Well, we (the Pijul team) are trying to learn from Darcs and not disregard that aspect. Darcs maintainers have been super busy fixing the performance issues, bu

Well, we (the Pijul team) are trying to learn from Darcs and not disregard that aspect. Darcs maintainers have been super busy fixing the performance issues, but since Pijul doesn't have those, we can invest more time in the tooling. Look at nest.pijul.com for example, or the satellite projects such as Thrussh (https://cargo.io/crates/thrussh https://cargo.io/crates/thrussh), which aim at making the UX as smooth as possible.

the_duke 7y ago
Correct url: https://crates.io/crates/thrussh https://crates.io/crates/thrussh
core-questions 7y ago
Thanks, this is fascinating. I'd been hoping to move one of my teams away from Darcs to Git but they're very set in their ways; gotta assume the work to bring them to Pijul would be just as much work, but then the other teams that use Git would also need to move. Way too much CD tooling to re-implement. Would consider for a new project, somewhere else, though. I really miss my perfect understanding of SVN when I get lost in some Git madness - it's obviously way more powerful and faster but sometimes I get into merge scenarios where I have to go edit files just to restore whatever I just did on another branch or what-have-you. Editors papering over this with extensions to "resolve using theirs" etc. help but seem like an ugly fix. I am interested in https://www.unisonweb.org/ https://www.unisonweb.org/ which I saw here recently as storing its code in a fundamentally different way that helps make ugly merge conflicts a thing of the past by making the on-disk format (and therefore the revision control system) aware of some aspects of the AST. I'd love to see this go further and have a "no conflict" merge take place as long as two edits to a single file touched different functions and the merged version passes some tests or whatever.
- pmeunier 7y ago
  > gotta assume the work to bring them to Pijul would be just as much work Not really. If they're not heavily relying on the "darcs replace" feature, it's just the same interface. The dependencies between patches are computed differently. Be careful though, Pijul is still 0.12, the patch format will change. > I'd love to see this go further and have a "no conflict" merge take place This seems possible in a future Pijul. Right now we're just starting to get text files right! Let's see in a few years.

the_duke 7y ago

Correct url: https://crates.io/crates/thrussh https://crates.io/crates/thrussh

core-questions 7y ago

Thanks, this is fascinating. I'd been hoping to move one of my teams away from Darcs to Git but they're very set in their ways; gotta assume the work to bring them to Pijul would be just as much work, but then the other teams that use Git would also need to move. Way too much CD tooling to re-implement. Would consider for a new project, somewhere else, though. I really miss my perfect understanding of SVN when I get lost in some Git madness - it's obviously way more powerful and faster but sometimes I get into merge scenarios where I have to go edit files just to restore whatever I just did on another branch or what-have-you. Editors papering over this with extensions to "resolve using theirs" etc. help but seem like an ugly fix. I am interested in https://www.unisonweb.org/ https://www.unisonweb.org/ which I saw here recently as storing its code in a fundamentally different way that helps make ugly merge conflicts a thing of the past by making the on-disk format (and therefore the revision control system) aware of some aspects of the AST. I'd love to see this go further and have a "no conflict" merge take place as long as two edits to a single file touched different functions and the merged version passes some tests or whatever.

pmeunier 7y ago
> gotta assume the work to bring them to Pijul would be just as much work Not really. If they're not heavily relying on the "darcs replace" feature, it's just the same interface. The dependencies between patches are computed differently. Be careful though, Pijul is still 0.12, the patch format will change. > I'd love to see this go further and have a "no conflict" merge take place This seems possible in a future Pijul. Right now we're just starting to get text files right! Let's see in a few years.