[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

update -r PREV causes tree conflict if a folder to be removed contains ignored sub-folder

From: Gert Kello <gert.kello_at_gmail.com>
Date: Thu, 27 Aug 2015 14:56:11 +0300

Hi.

I have a case where updating to older version causes tree conflict, if
update (to older revision) removes some folder and that folder has some
global-ignores ignored sub-folder. I'm not sure if that's a bug but it is
inconvenient for me...

The (windows cmd) script to create situation is attached. Basically,
1. The update removes folder
2. There's a unversioned subfolder in working copy
3. The subfolder is ignored via config file global-ignores

svn version 1.9.0 (r1692801), windows

If the unversioned folder is ignored via "svn:ignore" property then update
does not trigger tree conflict (but sequence 'svn up -R PREV && svn up'
still does...)

Am I doing something wrong with global-ignores?

Gert

Received on 2015-08-27 13:56:16 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.