The attached archive has 3 files in it
BRANCHES is the key file. It lives in the root of trunk. BRANCHES lists all known branches and where they should be merged to. Project branches should have two entries, one "out" to make sure the project branch is staying up to date, and one "in" to make sure that the project merges to somewhere useful someday. There are comments and examples in BRANCHES. changes is a script that checks for all commits since the last time it was run and categorizes them by branch and component (any directory under trunk is a component). It emits a warning if I finds a branch not listed in BRANCHES. tomerge is a script that reminds you of what needs to be merged and from where to where. I run changes and tomerge -c every morning. The path to the repository is hardcoded, as is the location of a workspace. I'd be open to any ideas as to how these could be calculated. JLM Jeremy Mordkoff Director, QA, IT & Release ZeeVee, Inc. One Monarch Drive | Littleton, MA 01460 Office: 978.467.1395 x233 | Fax: 978.467.1404 Mobile: 978-257-2183 j...@zeevee.com <mailto:j...@zeevee.com> www.zeevee.com <http://www.zeevee.com/> From: Erik Andersson [mailto:kir...@gmail.com] Sent: Wednesday, September 01, 2010 8:54 AM To: Jeremy Mordkoff Cc: users@subversion.apache.org Subject: Re: hint of the day On Wed, Sep 1, 2010 at 2:11 PM, Jeremy Mordkoff <j...@zeevee.com> wrote: Just an FYI for anyone that does merging. I just spent an hour cleaning up a mess with my mergeinfo's. I missed a hint that I was about to do something really stupid. Here's the merge: [rele...@zaz1 rel_2_5]$ svn merge $B/rel_2_5_3 --- Merging r14352 through r14594 into '.': U lcast/build/images/nand/root/lcast/etc/post_install.sh U lcast/build/images/nand/root/lcast/etc/lc_UpdateNOR.sh G . [rele...@zaz1 rel_2_5]$ svn commit -m 'merge from rel_2_5_3 of a fix made in trunk' Sending . Sending lcast/build/images/nand/root/lcast/etc/lc_UpdateNOR.sh Sending lcast/build/images/nand/root/lcast/etc/post_install.sh Transmitting file data .. Committed revision 14595. The hint I missed was the G next to the '.'. That should have told me that there were changes in my workspace, and since I never knowingly commit local changes and merges at the same time, I should have stopped right there. Also, I have some tools that I use to keep track of branches and stuff. Is there a good place to publish them? I'd like to see them very much. If you don't publish them anywhere, please send them my way. Cheers / Erik JLM
svn_tools.tar
Description: svn_tools.tar
