|
|
|
|
|
|
by luckydude
3334 days ago
|
|
|
VMS style versioning is not at all what I meant. What I meant is the OS implements the inode just like a versioned file in an SCM. Consider the /etc stuff. You wack apache's config, so does debian, you do an apt-get upgrade and it either automerges or you get presented with the 3 way merge in $EDITOR or our graphical file merge. In many cases, the system can just automerge it (BitKeeper has a pretty sophisticated way of doing, it's better than other answers in a lot of cases) and when it can't you get access to the full DAG and can use all the SCM tools to merge. |
|
|