gramps

On Tue, Oct 2, 2012 at 3:50 PM, Tim Lyons <guy.linton@...> wrote:
> I've tried to update my local trunk repository, and got the following:
>
>> update /Users/tim/gramps/trunk -r HEAD --force
>>     D   /Users/tim/gramps/trunk/src
>>     A   /Users/tim/gramps/trunk/Gramps.py
>>     Obstructed update
>> svn: Failed to add directory '/Users/tim/gramps/trunk/gramps': a non-
>> directory object of the same name already exists
>>
>
> Can you advise please?

You should be able to move whatever is currently there:

mv /Users/tim/gramps/trunk/gramps /Users/tim/gramps/trunk/old-gramps
(if you want to save it) or just: rm /Users/tim/gramps/trunk/gramps

and then "svn up" again.

-Doug

> Tim.
>
> ------------------------------------------------------------------------------
> Don't let slow site performance ruin your business. Deploy New Relic APM
> Deploy New Relic app performance management and know exactly
> what is happening inside your Ruby, Python, PHP, Java, and .NET app
> Try New Relic at no cost today and get our sweet Data Nerd shirt too!
> http://p.sf.net/sfu/newrelic-dev2dev
> _______________________________________________
> Gramps-devel mailing list
> Gramps-devel@...
> https://lists.sourceforge.net/lists/listinfo/gramps-devel

2012/10/2 Doug Blank <doug.blank@...>

> On Tue, Oct 2, 2012 at 3:50 PM, Tim Lyons <guy.linton@...> wrote:
> > I've tried to update my local trunk repository, and got the following:
> >
> >> update /Users/tim/gramps/trunk -r HEAD --force
> >>     D   /Users/tim/gramps/trunk/src
> >>     A   /Users/tim/gramps/trunk/Gramps.py
> >>     Obstructed update
> >> svn: Failed to add directory '/Users/tim/gramps/trunk/gramps': a non-
> >> directory object of the same name already exists
> >>
> >
> > Can you advise please?
>
> You should be able to move whatever is currently there:
>
> mv /Users/tim/gramps/trunk/gramps /Users/tim/gramps/trunk/old-gramps
> (if you want to save it) or just: rm /Users/tim/gramps/trunk/gramps
>
> and then "svn up" again.
>

Yes, the old make command created a gramps executable in the top directory.
This must be removed before you can continue checking out the code.

Benny

DS Blank wrote
> You should be able to move whatever is currently there:
> 
> mv /Users/tim/gramps/trunk/gramps /Users/tim/gramps/trunk/old-gramps
> (if you want to save it) or just: rm /Users/tim/gramps/trunk/gramps
> 
> and then "svn up" again.

Thanks for that, it worked.

However, trunk.src, trunk/m4 directories are not deleted, and trunk files:
aclocal.m4, config.status, configure, Makefile and Makefile.in are all not
deleted.

Is there an svn command that I should use to fix this? (I am only asking in
case it is something that needs to be published in the wiki, or if some fix
is needed in the svn repository).

Tim.


In case it helps, the start of the report looks like this:
update /Users/tim/gramps/trunk -r HEAD --force
    D   /Users/tim/gramps/trunk/m4
    U   /Users/tim/gramps/trunk/Gramps.py
    D   /Users/tim/gramps/trunk/config.rpath
    D   /Users/tim/gramps/trunk/example/Makefile.am
    D   /Users/tim/gramps/trunk/example/gramps/Makefile.am
    U   /Users/tim/gramps/trunk/mac/gramps.modules
    D   /Users/tim/gramps/trunk/gramps-autogen.sh
    U   /Users/tim/gramps/trunk/INSTALL
    D   /Users/tim/gramps/trunk/data/Makefile.am
    U   /Users/tim/gramps/trunk/MANIFEST.in
    D   /Users/tim/gramps/trunk/autogen.sh
    D   /Users/tim/gramps/trunk/po/gramps
    U   /Users/tim/gramps/trunk/po/cs.po
    U   /Users/tim/gramps/trunk/po/pt_BR.po
    U   /Users/tim/gramps/trunk/po/en_GB.po
    U   /Users/tim/gramps/trunk/po/POTFILES.in
    U   /Users/tim/gramps/trunk/po/POTFILES.skip
    U   /Users/tim/gramps/trunk/po/fr.po
    U   /Users/tim/gramps/trunk/po/pl.po
    U   /Users/tim/gramps/trunk/po/gramps.pot
    U   /Users/tim/gramps/trunk/po/update_po.py
    U   /Users/tim/gramps/trunk/test/GrampsDb/GrampsDbTestBase.py
    D   /Users/tim/gramps/trunk/configure.in
    U   /Users/tim/gramps/trunk/setup.py
    U   /Users/tim/gramps/trunk/README
    D   /Users/tim/gramps/trunk/acinclude.m4
    U   /Users/tim/gramps/trunk/gramps.sh.in
    D   /Users/tim/gramps/trunk/Makefile.am




--
View this message in context: http://gramps.1791082.n4.nabble.com/update-to-trunk-tp4656832p4656880.html
Sent from the GRAMPS - Dev mailing list archive at Nabble.com.

On 04/10/12 18:16, Tim Lyons wrote:
> Is there an svn command that I should use to fix this? (I am only asking in
> case it is something that needs to be published in the wiki, or if some fix
> is needed in the svn repository).
>
I don't think so.  I just deleted them.

Nick.

2012/10/4 Nick Hall <nick__hall@...>

> On 04/10/12 18:16, Tim Lyons wrote:
> > Is there an svn command that I should use to fix this? (I am only asking
> in
> > case it is something that needs to be published in the wiki, or if some
> fix
> > is needed in the svn repository).
> >
> I don't think so.  I just deleted them.
>

There are some options.

1/You can recheckout the entire branch. Then it is clean
2/Manually delete. Directories don't get deleted if files remain in them.
Do
svn status | grep '?   . ' > toremove

Then removewhat is in the file (make the file one line, and append to rm).
Makefile is then not deleted, as svn status does not see it. Makefile is in
propedit ignore of the directories. If somebody has time, it would be nice
to update that and make sure they are no longer ignored.

Benny

>
> Nick.
>
>
>
> ------------------------------------------------------------------------------
> Don't let slow site performance ruin your business. Deploy New Relic APM
> Deploy New Relic app performance management and know exactly
> what is happening inside your Ruby, Python, PHP, Java, and .NET app
> Try New Relic at no cost today and get our sweet Data Nerd shirt too!
> http://p.sf.net/sfu/newrelic-dev2dev
> _______________________________________________
> Gramps-devel mailing list
> Gramps-devel@...
> https://lists.sourceforge.net/lists/listinfo/gramps-devel
>