On May 23, 2012, at 08:28 PM, Tom Browder <[email protected]> wrote:

On Wed, May 23, 2012 at 7:23 PM, brlcad <[email protected]> wrote:

> If you don't have any local changes, I believe you can substitute the repo
> root with an "svn merge -r50643:50642 ." and maybe even if you do.

Nope, didn't work in this case.
 
Huh, interesting.  Do you recall the error or have a copy of the output handy?  I know that path/to/file merge form works on individual files, but perhaps it's problematic to be run that way on tree nodes.  Most newer versions of svn track which revisions have been merged and will not repeat a merge without encouragement.

I see you also got the undo terminology and root url method straight from the Subversion manual.  It's a curious imprecise term that I believe they used to be careful to avoid. ;)  Apparently not any more.

Cheers!
Sean


------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
BRL-CAD Developer mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-devel

Reply via email to