2

I find a lot of svn commands out there to delete directories and files. Unfortunately, every time I run these commands, I get strange errors afterwards like 'not under version control' or 'conflict'. I'm just looking for a straightforward svn command that will allow me to delete all the directories under the MARKT directory below so I can then create new directories with the same nanme as the one I deleted, without any conflict arising:

[root@Proxima marketing]# cd MARKT
[root@Proxima MARKT]# ls
app  Capfile  config  db  doc  IDENTIFIED  lib  log  public  Rakefile  README  README.txt  script  test  tmp  vendor

I'm using mac OSX. Thanks for any response.

I try to delete a directory and commit and I get this:

Commit failed (details follow):
Aborting commit: '/Users/jmerlino/MARKSITE AUGUST/db' remains in tree-conflict

In fact, I get this tree conflict for every single directory.

Brian Tompsett - 汤莱恩
  • 5,753
  • 72
  • 57
  • 129
JohnMerlino
  • 3,900
  • 4
  • 57
  • 89
  • Issue arises when I try to copy new folders with the same name as the one deleted into the MARKT main directory. I get svn errors. – JohnMerlino Sep 10 '10 at 17:11
  • Try committing the deletions first? – Amber Sep 10 '10 at 17:15
  • I try. I get the tree-conflict issue. – JohnMerlino Sep 10 '10 at 17:26
  • Can you verify if both your svn client and svn server versions are both 1.6? Tree conflicts are a new feature in 1.6, and a 1.5 client won't understand them if talking to a 1.6 server and vice versa – Joshua McKinnon Sep 10 '10 at 17:39
  • Wanted to ask the same question. But the client version does not seem to be the issue. – zellus Sep 10 '10 at 19:57
  • What happens if you delete the folder using *rm folder-name* and do an update. Then try again to do a *svn delete*. An *svn cleanup* can be useful aswell. – zellus Sep 10 '10 at 20:01
  • You may have a look at http://stackoverflow.com/questions/767763/svn-how-to-resolve-new-tree-conflicts-when-file-is-added-on-two-branches . Not exactly your issue but related. – zellus Sep 10 '10 at 20:07

2 Answers2

1

remains in tree-conflict

means that the directory has been merged and svn has found the directory is missing (or added) when it thinks it should/ shouldn't be. In short, its telling you that something is a big wrong and that you need to sort it out (resolve it) before continuing.

You have to svn resolve the parent directory before you can do anything with that WC. (ok, you could svn revert is you prefer to start again)

Tree conflicts are basically merges between 2 different directory trees that svn cannot fix by itself. This of a directory as a file with a list of files in it, if you delete lines from this file (eg delete directories) or add lines (add dirs) and then merge this 'file', and svn cannot perform the merge (eg as you've deleted and added the same dir on different merge targets) then it will tell you - by reporting a conflict. Its then up to you to fix things and tell svn you've fixed it.

gbjbaanb
  • 51,617
  • 12
  • 104
  • 148
0

To delete a directory under MARKT:

> cd MARKT
> svn delete <dir1>
> svn delete <dir2>
> svn commit

To create a new directory under MARKT:

> mkdir <dir1>
> mkdir <dir2>
> svn add <dir1>
> svn add <dir2>
> svn commit
Sudhanshu
  • 2,691
  • 1
  • 18
  • 25