svn vs csup usage question

[Trond Endrestøl]

On Wed, 3 Oct 2012 10:57-0700, Dennis Glatting wrote:

> On Wed, 2012-10-03 at 14:20 +0200, Trond Endrestøl wrote:
> > On Wed, 3 Oct 2012 04:56-0700, Dennis Glatting wrote:
> > 
> > > I often modify configuration files in the src and ports tree. Normally
> > > this isn't a problem becuase csup determines which files changed and
> > > pulled fresh copies from the repository.
> > > 
> > > I doin't see a svn mechansim to do that, for example: 
> > > 
> > > 	svn co -verify repo target
> > > 
> > > It appears the contents of .svn is all that is check on checkout and not
> > > the files themselves.
> > 
> > Do you always checkout a complete source or ports tree?
> 
> I run this command:
> 
> 	svn co svn://svn.pki2.com/base/stable/9 /disk-2/src
> 	
> The changes I make are quick hacks, such as changing comilation options
> or minor code changes for test. They are (almost) never meant for
> permanency. For example, last night I changed the compilation options
> for the kernel from -O2 to -O simply to see if that has any impact on
> the kernel/ZFS problems I am having. I suspect not, but it is worth a
> try. I now want that file restored to its origional state. 

Then the svn revert command is probably what you want.

> > Maybe svn update --accept X, for some useful value of X is what you 
> > want?
> > 
> > According to PDF manual for svn 1.7, page 251, physical PDF page 272, 
> > X can be one of:
> > 
> > postpone (p)
> > Take no resolution action at all and instead allow the conflicts to be 
> > recorded for future resolution.
> > 
> > edit (e)
> > Open each conflicted file in a text editor for manual resolution of 
> > line-based conflicts.
> > 
> > launch (l)
> > Launch an interactive merge conflict resolution tool for each 
> > conflicted file.
> > 
> > base
> > Choose the file that was the (unmodified) BASE revision before you 
> > tried to integrate changes from the server into your working
> > copy.
> > 
> > working
> > Assuming that you've manually handled the conflict resolution, choose 
> > the version of the file as it currently stands in your
> > working copy.
> > 
> > mine-full (mf)
> > Resolve conflicted files by preserving all local modifications and 
> > discarding all changes fetched from the server during the operation
> > which caused the conflict.
> > 
> > theirs-full (tf)
> > Resolve conflicted files by discarding all local modifications and 
> > integrating all changes fetched from the server during the operation
> > which caused the conflict.
> > 
> > mine-conflict (mc)
> > Resolve conflicted files by preferring local modifications over the 
> > changes fetched from the server in conflicting regions of
> > each file's content.
> > 
> > theirs-conflict (tc)
> > Resolve conflicted files by preferring the changes fetched from the 
> > server over local modifications in conflicting regions of
> > each file's content.

-- 
+-------------------------------+------------------------------------+
| Vennlig hilsen,               | Best regards,                      |
| Trond Endrestøl,              | Trond Endrestøl,                   |
| IT-ansvarlig,                 | System administrator,              |
| Fagskolen Innlandet,          | Gjøvik Technical College, Norway,  |
| tlf. mob.   952 62 567,       | Cellular...: +47 952 62 567,       |
| sentralbord 61 14 54 00.      | Switchboard: +47 61 14 54 00.      |
+-------------------------------+------------------------------------+