Yes, this is the wrong mailing list for this.. no, I don't know where
else to ask.
I always think of thte G/G/G/G (grails, groovy, gradle, griffon)
community as some of the smartest.. so when i'm finally stumped.. i'm
coming here.
if I have 2 branches like:
t1
/a
/b
t2
/b
/c
where t1/a was made before t2
and t2/c was made after the last thing I did with t1
I can't do an "svn cp" to merge them.. due to the conflict on folder b..
it just says "folder already exists" and quits
but if I made a t3
and I do:
svn merge https://svn/t1 https://svn/t2 .
I end up with either:
t3
/b
/c
or
t3
/a
/b
(depending on which I put first int he svn merge).
So, I mean.. this HAS to be a solved problem hah.. but how the heck and
I can svn to literally MERGE 2 projects together.. I am *100% sure*
there are *0* file conflicts.. but I know there are lots of "tree"
(folder name) conflicts.
Anyway.. apologies.. I know.. not G/G/G/G (though I might write a
groovy script to traverse things and do evil magicif I have to to solve
this)
Just thought i'd ask the pool of wise ones if anyone has even the
slightest idea how to solve something like this
Thanks
Roger
(and there are more G's... Geb, GPars.. not to leave them out heh)
---------------------------------------------------------------------
To unsubscribe from this list, please visit:
http://xircles.codehaus.org/manage_email
