| 1 |
On Thu, Jul 12, 2012 at 8:50 PM, Alexandre Rostovtsev |
| 2 |
<tetromino@g.o> wrote: |
| 3 |
> Shouldn't CVS have prevented my changes to profile.mask from being |
| 4 |
> overwritten by the next committer? |
| 5 |
|
| 6 |
Maybe Tony mismerged your changes into his? |
| 7 |
|
| 8 |
On Thu, Jul 12, 2012 at 9:04 PM, Fabian Groffen <grobian@g.o> wrote: |
| 9 |
> On 12-07-2012 14:50:18 -0400, Alexandre Rostovtsev wrote: |
| 10 |
>> Shouldn't CVS have prevented my changes to profile.mask from being |
| 11 |
>> overwritten by the next committer? |
| 12 |
> |
| 13 |
> How could CVS have done that (or git, hg, whatever VCS)? |
| 14 |
|
| 15 |
In general, the VCS would not let you commit/push conflicting changes. |
| 16 |
For CVS, I think you cannot commit unless your local copy is up to |
| 17 |
date, so you'd have to update before committing, at which point CVS |
| 18 |
would launch a merge tool or put merge markers in the file. |
| 19 |
|
| 20 |
Right? |
| 21 |
|
| 22 |
Dirkjan |
Archives