Версия в репозитории должна содержать
только независимые друг от друга файлы.
Не должно быть:
- бинарных файлов, зависящих от исходников
- других промежуточных файлов
Иначе возникают такие ситуации:
$svn update
...
Conflict discovered in 'lcc/build/bin/lcc-lcc'.
Select: (p) postpone,
(mf) mine-full, (tf) theirs-full,
(s) show all options: p
C lcc/build/bin/lcc-lcc
Conflict discovered in 'lcc/build/bin/lcc'.
Select: (p) postpone,
(mf) mine-full, (tf) theirs-full,
(s) show all options: p
C lcc/build/bin/lcc
Conflict discovered in 'lcc/build/bin/lburg-lcc'.
Select: (p) postpone,
(mf) mine-full, (tf) theirs-full,
(s) show all options: p
C lcc/build/bin/lburg-lcc
Conflict discovered in 'lcc/build/bin/lburg'.
Select: (p) postpone,
(mf) mine-full, (tf) theirs-full,
(s) show all options: p
Такого быть не должно.
Original issue reported on code.google.com by diman...@gmail.com on 3 Apr 2011 at 11:27
Original issue reported on code.google.com by
diman...@gmail.com
on 3 Apr 2011 at 11:27