svn info dev branch
===================
Path: .
URL: http://svn.freeswitch.org/svn/freeswitch/branches/greenlizard
Repository UUID: d0543943-73ff-0310-b7d9-9358b9ac24b2
Revision: 5124
Node Kind: directory
Schedule: normal
Last Changed Author: greenlizard
Last Changed Rev: 5124
Last Changed Date: 2007-05-10 13:44:04 -0400 (Thu, 10 May 2007)
Properties Last Updated: 2007-05-10 13:21:06 -0400 (Thu, 10 May 2007)
svn info trunk
==============
Path: .
URL: http://svn.freeswitch.org/svn/freeswitch/trunk
Repository Root: http://svn.freeswitch.org/svn
Repository UUID: d0543943-73ff-0310-b7d9-9358b9ac24b2
Revision: 5170
Node Kind: directory
Schedule: normal
Last Changed Author: anthm
Last Changed Rev: 5170
Last Changed Date: 2007-05-14 08:54:52 -0500 (Mon, 14 May 2007)
Find out which trunk version it was branched off of
===================================================
tleyden@sp0559b:/usr/src/freeswitch_greenlizard$ svn log bootstrap.sh
------------------------------------------------------------------------
r5124 | greenlizard | 2007-05-10 13:44:04 -0400 (Thu, 10 May 2007) | 1 line
branched off of trunk revision 5123
Merge
=====
svn merge http://svn.freeswitch.org/svn/freeswitch/trunk -r 5123:HEAD
A build/ignore_helper.pl
U conf/sofia.conf.xml
U conf/default_context.xml
U conf/directory.xml
U conf/iax.conf.xml
U conf/xml_curl.conf.xml
U bootstrap.sh
U scripts/socket/socket2me
U src/switch_scheduler.c
U src/switch_core_session.c
U src/switch_ivr_async.c
U src/switch_caller.c
U src/switch_rtp.c
U src/switch_regex.c
(... etc .. no conflicts)
Commit
======
svn commit -m "Sync up changes from trunk version 5123 to 5170"
Sending .
svn: Commit failed (details follow):
svn: CHECKOUT of '/svn/!svn/ver/5124/freeswitch/branches/greenlizard': 409 Conflict (http://svn.freeswitch.org)