On Mon, Jun 18, 2007 at 08:28:30PM +0700, Andika Triwidada <[EMAIL PROTECTED]>
wrote:
> Ahh, yes. My copy show 5000.0 now (r212).
>
> I don't understand how svn works. I often have several versions of
> id.po{,rMMM,rNNN}. After doing make, some files might contain many
> delimiter in the form
> <<< mine
> ... first version
> === rXXX
> ... second version
> (another delimiter I dont really remember)
>
> What process creates them?
svn update does.
> How do I make sure I won't get those
> problems again?
just make sure to resolve the conflicts that appear when you do svn
update. You can spot them when doing the update: they have a C in the
status column. (you can also spot them later on in svn status).
These conflicts are due to changes you made to the code that /conflict/
with the changes that have been made in the svn repository. You then
get, IIRC, a copy of your version of the file, a copy of the version you
updated from (i.e. the original version, without your changes), and a
copy of the version you update to (i.e. the newer version, without your
changes, since they can't be merged). You also have the file itself
containing the <<< mine, etc. you noted.
Once you've resolved the conflict in the file itself, just run
svn resolved <path> and you're done. It will remove the extra files.
Mike
_______________________________________________
Power mailing list
[email protected]
http://www.bughost.org/mailman/listinfo/power
