Eric, -http://developer.jasig.org/source/changelog/jasigsvn?cs=45305 - the line deleted in the changeset is back in trunk and rel-3-1-patches. This file doesn't exist in 3-0-patches
-http://developer.jasig.org/source/changelog/jasigsvn?cs=45355 - doesn't affect rel-3-0-patches -http://developer.jasig.org/source/changelog/jasigsvn?cs=45402 & http://developer.jasig.org/source/changelog/jasigsvn?cs=45406 require http://developer.jasig.org/source/changelog/jasigsvn?cs=44282 before I can apply these... Dustin. 2009/3/24 Dustin S. <[email protected]> > Eric, > > I can merge mine tomorrow. I was looking at > > - http://developer.jasig.org/source/changelog/jasigsvn?cs=45305 > > and I'm not sure what happened but I removed a line in that changeset and > also merged it to 3-1-patches and now the line is back in both trunk and > patches. Any ideas? > > Dustin. > > 2009/3/24 Eric Dalquist <[email protected]> > > With the flurry of activity for 3.1 I feel way behind on keeping track of >> what needs to be merged back into the 3.0-patches branch. I'd love to get >> the merge history updated and any potential issues in 3.0 fixed. What I've >> put together is a list of revisions organized by committer for changes that >> svnmerge thinks need to be either merged or blocked. >> >> While I would love for each developer to fire up svnmerge and run the >> merge or block commands I'll be perfectly happy with a response telling me >> which revisions can be merged, which already have been and which should be >> ignored. If you're interested in trying out svnmerge just catch me on IRC or >> IM and I can show you how. >> >> Below are the list of changes that need to be merged and who the >> originally commiter was. >> >> I do want to thank all of the people below for so much help during the 3.1 >> development, and testing process. Without commit help from folks like them >> and others on this list we wouldn't have the great project we do. >> >> -Eric >> >> Andrew W. >> - http://developer.jasig.org/source/changelog/jasigsvn?cs=45313 >> - http://developer.jasig.org/source/changelog/jasigsvn?cs=45366 >> - http://developer.jasig.org/source/changelog/jasigsvn?cs=45409 >> - http://developer.jasig.org/source/changelog/jasigsvn?cs=45461 >> - http://developer.jasig.org/source/changelog/jasigsvn?cs=45491 >> - http://developer.jasig.org/source/changelog/jasigsvn?cs=45509 >> >> Jen B. >> - http://developer.jasig.org/source/changelog/jasigsvn?cs=45295 >> - http://developer.jasig.org/source/changelog/jasigsvn?cs=45296 >> - http://developer.jasig.org/source/changelog/jasigsvn?cs=45299 >> - http://developer.jasig.org/source/changelog/jasigsvn?cs=45342 >> - http://developer.jasig.org/source/changelog/jasigsvn?cs=45487 >> - http://developer.jasig.org/source/changelog/jasigsvn?cs=45488 >> - http://developer.jasig.org/source/changelog/jasigsvn?cs=45496 >> - http://developer.jasig.org/source/changelog/jasigsvn?cs=45507 >> - http://developer.jasig.org/source/changelog/jasigsvn?cs=45511 >> - http://developer.jasig.org/source/changelog/jasigsvn?cs=45512 >> - http://developer.jasig.org/source/changelog/jasigsvn?cs=45513 >> - http://developer.jasig.org/source/changelog/jasigsvn?cs=45514 >> - http://developer.jasig.org/source/changelog/jasigsvn?cs=45531 >> - http://developer.jasig.org/source/changelog/jasigsvn?cs=45532 >> - http://developer.jasig.org/source/changelog/jasigsvn?cs=45533 >> - http://developer.jasig.org/source/changelog/jasigsvn?cs=45534 >> - http://developer.jasig.org/source/changelog/jasigsvn?cs=45535 >> - http://developer.jasig.org/source/changelog/jasigsvn?cs=45536 >> - http://developer.jasig.org/source/changelog/jasigsvn?cs=45542 >> - http://developer.jasig.org/source/changelog/jasigsvn?cs=45543 >> >> Dustin S. >> - http://developer.jasig.org/source/changelog/jasigsvn?cs=45305 >> - http://developer.jasig.org/source/changelog/jasigsvn?cs=45355 >> - http://developer.jasig.org/source/changelog/jasigsvn?cs=45402 >> - http://developer.jasig.org/source/changelog/jasigsvn?cs=45406 >> >> Gary T. >> - http://developer.jasig.org/source/changelog/jasigsvn?cs=45309 >> - http://developer.jasig.org/source/changelog/jasigsvn?cs=45310 >> - http://developer.jasig.org/source/changelog/jasigsvn?cs=45311 >> - http://developer.jasig.org/source/changelog/jasigsvn?cs=45383 >> - http://developer.jasig.org/source/changelog/jasigsvn?cs=45515 >> - http://developer.jasig.org/source/changelog/jasigsvn?cs=45529 >> - http://developer.jasig.org/source/changelog/jasigsvn?cs=45530 >> - http://developer.jasig.org/source/changelog/jasigsvn?cs=45538 >> - http://developer.jasig.org/source/changelog/jasigsvn?cs=45539 >> >> >> > -- You are currently subscribed to [email protected] as: [email protected] To unsubscribe, change settings or access archives, see http://www.ja-sig.org/wiki/display/JSG/uportal-dev
