Mailing-List: contact users-help@subversion.apache.org; run by ezmlm
Precedence: bulk
MIME-Version: 1.0
Date: Thu, 27 Aug 2015 14:56:11 +0300
Message-ID: 
 <CA+L=CgV3VaQM48A9UhCDGLUJ00a4irtD0rCENm5i5XKRmGOqkg@mail.gmail.com>
Subject: update -r PREV causes tree conflict if a folder to be removed
 contains ignored sub-folder
From: Gert Kello <gert.kello@gmail.com>
To: "users@subversion.apache.org" <users@subversion.apache.org>
Content-Type: multipart/mixed; boundary=001a1134c376491aea051e49a73a

--001a1134c376491aea051e49a73a
Content-Type: multipart/alternative; boundary=001a1134c376491ae6051e49a738

--001a1134c376491ae6051e49a738
Content-Type: text/plain; charset=UTF-8

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

--001a1134c376491ae6051e49a738
Content-Type: text/html; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr"><div><div><div><div><div><div>Hi.<br><br></div>I have a ca=
se where updating to older version causes tree conflict, if update (to olde=
r revision) removes some folder and that folder has some global-ignores ign=
ored sub-folder. I&#39;m not sure if that&#39;s a bug but it is inconvenien=
t for me...<br><br></div>The (windows cmd) script to create situation is at=
tached. Basically, <br>1. The update removes folder<br></div>2. There&#39;s=
 a unversioned subfolder in working copy<br></div>3. The subfolder is ignor=
ed via config file global-ignores<br><br>svn version 1.9.0 (r1692801), wind=
ows<br><br></div>If the unversioned folder is ignored via &quot;svn:ignore&=
quot; property then update does not trigger tree conflict (but sequence =
9;svn up -R PREV &amp;&amp; svn up&#39; still does...)<br><br></div><div>Am=
 I doing something wrong with global-ignores?<br></div><div><br></div>Gert<=
br></div>

--001a1134c376491ae6051e49a738--

--001a1134c376491aea051e49a73a
Content-Type: text/plain; charset=US-ASCII; name="SvnUpdateTreeConflict.txt"
Content-Disposition: attachment; filename="SvnUpdateTreeConflict.txt"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_idu5ku2t0

QGVjaG8gb2ZmDQpTRVQgdGVzdGRpcj10ZXN0DQpzZXQgVVJMPWZpbGU6Ly8vJUNEJS90ZXN0L3Jl
cG9zDQpzZXQgVVJMPSVVUkw6QzpcPVwlDQpzZXQgVVJMPSVVUkw6XD0vJQ0KZWNobyBCYXNlIHVy
bCBmb3IgcmVwbzogJVVSTCUNCg0KUk1ESVIgL1EgL1MgJXRlc3RkaXIlDQpta2RpciAldGVzdGRp
ciUgfHwgZ290byBlcnJvcg0Kc3ZuYWRtaW4gY3JlYXRlICV0ZXN0ZGlyJVxyZXBvcyB8fCBnb3Rv
IGVycm9yDQpzdm4gbWtkaXIgJVVSTCUvdHJ1bmsgLW0gIiIgfHwgZ290byBlcnJvcg0Kc3ZuIGNv
ICVVUkwlL3RydW5rICV0ZXN0ZGlyJVx0cnVuayB8fCBnb3RvIGVycm9yDQpta2RpciAldGVzdGRp
ciVcdHJ1bmtcdGVzdCB8fCBnb3RvIGVycm9yDQplY2hvIFRlc3QxID4gJXRlc3RkaXIlXHRydW5r
XHRlc3RcYS50eHQgfHwgZ290byBlcnJvcg0Kc3ZuIGFkZCAtLXBhcmVudHMgJXRlc3RkaXIlXHRy
dW5rXHRlc3RcYS50eHQgfHwgZ290byBlcnJvcg0Kc3ZuIHBzIHN2bjppZ25vcmUgYmluICV0ZXN0
ZGlyJVx0cnVua1x0ZXN0IHx8IGdvdG8gZXJyb3INCnN2biBjb21taXQgJXRlc3RkaXIlXHRydW5r
IC1tICIiIHx8IGdvdG8gZXJyb3INCg0KRUNITyBzdm46aWdub3JlIGlzIE9rIHRvIGJlIGluIHJl
bW92ZWQgZGlyDQpzdm4gY28gJVVSTCUvdHJ1bmsgJXRlc3RkaXIlXHdjMSB8fCBnb3RvIGVycm9y
DQpta2RpciAgJXRlc3RkaXIlXHdjMVx0ZXN0XGJpbiB8fCBnb3RvIGVycm9yDQpSRU0gY2hlY2sg
dGhhdCB3b3JraW5nIGNvcHkgc3RhdHVzIGlzIGNsZWFuDQpzdm4gc3RhdHVzICV0ZXN0ZGlyJVx3
YzEgfHwgZ290byBlcnJvcg0Kc3ZuIHVwICV0ZXN0ZGlyJVx3YzEgLXIgUFJFViB8fCBnb3RvIGVy
cm9yDQpFQ0hPICdzdm4gdXAgJXRlc3RkaXIlXHdjMScgd291bGQgY2F1c2UgdHJlZSBjb25mbGlj
dCBub3cNCkVDSE8gJ3N2biB1cCAldGVzdGRpciVcd2MxIC0tZm9yY2UnIHdvdWxkIHdvcmsNCkVD
SE8uDQoNCkVDSE8gZ2xvYmFsLWlnbm9yZXMgaXMgbm90IE9rIHRvIGJlIGluIHJlbW92ZWQgZGly
DQpzdm4gY28gJVVSTCUvdHJ1bmsgJXRlc3RkaXIlXHdjMiB8fCBnb3RvIGVycm9yDQpta2RpciAg
JXRlc3RkaXIlXHdjMlx0ZXN0XG9iaiB8fCBnb3RvIGVycm9yDQpSRU0gY2hlY2sgdGhhdCB3b3Jr
aW5nIGNvcHkgc3RhdHVzIGlzIGNsZWFuDQpzdm4gc3RhdHVzICV0ZXN0ZGlyJVx3YzIgLS1jb25m
aWctb3B0aW9uIGNvbmZpZzptaXNjZWxsYW55Omdsb2JhbC1pZ25vcmVzPW9iaiB8fCBnb3RvIGVy
cm9yDQpzdm4gdXAgJXRlc3RkaXIlXHdjMiAtciBQUkVWIC0tZm9yY2UgLS1jb25maWctb3B0aW9u
IGNvbmZpZzptaXNjZWxsYW55Omdsb2JhbC1pZ25vcmVzPW9iag0KZ290byBlbmQNCg0KOmVycm9y
IA0KZWNobyBUaGUgc2NyaXB0IGRpZCBub3Qgd29yayBPay4NCg0KOmVuZA==
--001a1134c376491aea051e49a73a--