[GRASS-dev] SVN trunk issue with g.list and g.remove (and solution)

[Markus Neteler]

Hi,

likely you will be affected by this recent issue:

Tree conflict on 'grass_trunk/general/g.list'
   > local dir unversioned, incoming dir add upon update
Select: (r) mark resolved, (p) postpone, (q) quit resolution, (h) help: r
Resolved conflicted state of 'grass_trunk/general/g.list'
Tree conflict on 'grass_trunk/general/g.remove'
   > local dir unversioned, incoming dir add upon update
Select: (r) mark resolved, (p) postpone, (q) quit resolution, (h) help: r


svn status | grep -v "^?"
D       general/g.list
D       general/g.list/Makefile
D       general/g.list/g.list.html
D       general/g.list/main.c
D       general/g.list/testsuite
D       general/g.list/testsuite/test_g_list.py
D       general/g.remove
D       general/g.remove/Makefile
D       general/g.remove/check_reclass.c
D       general/g.remove/g.remove.html
D       general/g.remove/main.c
D       general/g.remove/testsuite
D       general/g.remove/testsuite/test_g_remove.py

To solve that:

# clean
make distclean

# revert mess
svn -R revert general/g.list
svn -R revert general/g.remove

# update and check
svn up
svn status

I had to do this on all my SVN copies of trunk.

Markus