svn checkout

[nobrainer]

When I did the SVN Checkout this morning to go from 368 to 371, the following came up.

[code]$ svn checkout http://instadmg.googlecode.com/svn/trunk instadmg
A instadmg/AddOns/createUser/createUser.pkg/Contents/Resources/generatePasswordHash.py
Conflict discovered in ‘instadmg/AddOns/InstaUp2Date/CatalogFiles/10.6_vanilla.catalog’.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options:[/code]

I’m assuming that if I choose “r” for resolved – accept merged version of file – it will merge the update with the current?

[nobrainer]

Couldn’t do “r”, but “tc” seemed to work.

[dead2sin]

That is functionality of the SVN, but I’m not sure why it won’t let you just replace it. One thing you can try is moving the 10.6_vanilla.catalog to another folder and re-running it. SVN should see it is missing and just give you the latest version.

Nate

[larkost]

This is SVN telling you that it has noticed that you made a modification to that file locally, one that does not match the new version that is on the server (or the version you are coming from).

This is really timely, as I have been thinking over a better way for most people to keep their base catalog files up-to-date without requiring them to know how svn works. I plan to add a part of this as the last bit to 1.6, and then do some more with it for 1.7.

Oh, and the vast majority of the time you probably should not made modifications to the vanilla catalog files, but rather if you are building on top of them create your own catalog file, and link-in the vanilla.catalog file using a line like:
[code]include-file: 10.6_vanilla[/code]

It should not really matter where you put that line in order, but logically it should probably be first.

[Author]

Posts