Solved svn messages

talsamon

talsamon

Everytimes I make svn update I get messages like this
Code: 
Tree conflict on 'deskutils'
> local dir delete, incoming dir edit upon update
and what is to do?
Code: 
Select: (mc) keep affected local moves,
  (r) mark resolved (breaks moves), (p) postpone,
  (q) quit resolution, (h) help:
resolve?
(I will it never understand...)
 
It means you have some local changes and you'll need to resolve the conflict. Perhaps you edited files from this port? If you don't care about your local edits the easiest way to resolve is to just delete the offending files. An SVN update will simply check out the missing files from the server.
 
It looks like it has a problem with /usr/ports/deskutils/. So I would just remove that whole directory. If all else fails simply remove the whole /usr/ports/ tree and do a new check-out.
 
That make so sense, I have around 15 such messages (mostly for directories). I tried in the past to make a new svn checkout, but this change not this behaviour.
Around five minutes ago, the was one port changed on the server. I tried again svn checkout and got the same message because of this one port. I never edited this port locally.
(If I remove /usr/ports I would loose all my local changes, is this the sense of svn?)
 
You can only do a check-out if the directory doesn't exist. So you cannot do a check-out if /usr/ports is still there. An update will try to merge your local changes with the server's version. If there are conflicts you have to decide how to solve them before the update can continue (so you can save your local changes for example). But if you don't care about your local changes I would simply remove everything and start with a fresh check-out.
 
I did not want type in one hundred times "r". Thar is what I hate with svn, you cannot recognize what to do - "specify automatic conflict resolution" and which ARG ? (postpone is it not, but what means the other? - no description....)
Code: 
--accept ARG  : specify automatic conflict resolution action
  ('postpone', 'working', 'base', 'mine-conflict',
  'theirs-conflict', 'mine-full', 'theirs-full',
  'edit', 'launch')

What is mine-conflict or theirs-conflict ???
 
If I recall correctly "mine-conflict" accepts your local changes and ignores the server's update. With "their-conflict" it's the other way around. Not sure what the others are, I'm not a SVN-master. I know just enough to get me by ;)
 
The easy way to do this is to delete the local file or directory, then let Subversion put whatever it wants there. For example:
rm -rf /usr/ports/deskutils
svn revert --depth=infinity /usr/ports/deskutils
 
No !! Every change from the server it got this message for any /usr/ports directory that is changed. This can never be right. I had every times to delete the directory. That is nonsense. The directory cannot be wrong, I fetched /usr/ports new a few days ago (see the other svn thread) and make the .svn new.
Something is totally weird or svn is crap.
Last changes net/haproxy-devel and dns/opendnssec on the server and I got the message for the directory net and dns. I never changed locally something in this two directories.
Over the last two years I have tried svn several times. I had ever to type in r and r and r and r.... And I changed something in the portstree locally about the last half year. But before it was the same problem.
 
Odd, I've been getting both the ports and source tree through SVN for years, I never have those issues. Even before SVN CVS worked as it should. Are you sure there isn't something else that keeps corrupting your ports tree? Are you perhaps mixing portsnap(8) and SVN?
 
You can't use portsnap and svn ? Ok , I delete svn ...grrrrml. (Don't understand this, portsnap fetches no other files than svn)
 
Yes, but they keep track of changes differently. Use one or the other, not both.
 
You must log in or register to reply here.
Back
Top