Try "revert"
Adam R. B. Jack wrote:
I tried doing 'svn update' and I get a conflict 'cos of some file I may have
changed down in ant/test (probably sandbox.chalko) that I'd not checked in.
I can't seem to find a --force option to ignore this. Any thoughts? Getting
used to SVN is slow going...
regards
Adam
----- Original Message -----
From: "Adam R. B. Jack" <[EMAIL PROTECTED]>
To: "Depot Development" <[EMAIL PROTECTED]>
Sent: Wednesday, April 07, 2004 7:24 AM
Subject: Re: More source tree combining.
I wonder if we can achieve the discipline I was hoping for (w/o the
hassle)
by still building it in two parts in Gump, to ensure no ant dependencies
get
into non-ant work. Oh well, no biggee. Yours was the right call.
I appreciate you making progress on this...
regards
Adam
----- Original Message -----
From: "Nick Chalko" <[EMAIL PROTECTED]>
To: "Depot Development" <[EMAIL PROTECTED]>
Sent: Wednesday, April 07, 2004 12:20 AM
Subject: More source tree combining.
Ok I combined the version source tree, no more ant/core
I also fixed the jar so it get the antlib.xml.
I am using the build_antlet.xml
They are working really well for me.
I added an version antlet and I will try to publish it soon.
Take a look at the sample usage at,
https://svn.apache.org/repos/asf/incubator/depot/trunk/version/src/test/antlet/build.xml
R,
Nick
