[pacman-dev] My $0.02 on the Frugalware v.s. Arch bit...
Jeff 'codemac' Mickey
jeff at archlinux.org
Tue Jan 2 02:26:29 EST 2007
* On Monday, January 01 2007, James Rosten wrote:
>I think the one problem with that might be that, say you make a patch
>and apply it and commit it upstream, but while you were doing that
>someone else committed something that screws up your commit or you
>overwrite their commit. Of course, I don't use CVS very often and
>maybe it has some way around this, but if it doesn't that could lead
>to some problems.
uhh.. this is called a "file conflict". Usually this will cause the second
person's commit to fail, and leave them with the diff that broke the
commit. The developer would then merge ( or edit and fix ) the two files,
It happens all the time, and this is literally the purpose of most revision
control systems, handling multiple users editng the same file.
.: [ + carpe diem totus tuus + ] :.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Size: 189 bytes
Desc: not available
More information about the pacman-dev