You're kidding, right? trunk and 1_1 are nowhere near identical. trunk is in the middle of a build system and vncviewer overhaul. I am waiting for Cendio to be done with this overhaul so I can get the pre-release build system working again, re-integrate with build-xorg, fix whatever needs fixing in the CMake build system, etc. This is more thousands of dollars of free labor, so if I'm going to have to do the work for free, I only want to do it once.
On 4/28/11 3:13 AM, Adam Tkac wrote: > That's right you prefer not to commit changes without testing. > > On the other side, when code is identical (and we can say trunk and 1_1 > is currently identical), you can test changes only in 1_1 branch and > then commit it to both trunk and 1_1. Does it sounds acceptable for you? > Otherwise we can find quite hard to keep trunk up2date. > > Regards, Adam > > On 04/27/2011 08:53 PM, DRC wrote: >> Yes, I think a lot of those were mine. I tend to prefer not to commit >> something unless I can verify that it works, and that's currently >> difficult with the trunk, since it is in a state of flux. >> >> >> On 4/27/11 6:34 AM, Adam Tkac wrote: >>> Hello all, >>> >>> I found that some changes in 1_1 branch weren't committed into trunk so >>> I went through 1_1 log and merged all uncommitted changes to trunk. Now >>> both trunk and 1_1 are sanitized. >>> >>> Next time please commit all changes to trunk before you commit them to >>> stable branch and then simply "svn merge" them. Otherwise we can lose >>> patches, cause regressions and our svn will be messy. >>> >>> Regards, Adam >>> >>> ------------------------------------------------------------------------------ >>> >>> WhatsUp Gold - Download Free Network Management Software >>> The most intuitive, comprehensive, and cost-effective network >>> management toolset available today. Delivers lowest initial >>> acquisition cost and overall TCO of any competing solution. >>> http://p.sf.net/sfu/whatsupgold-sd >>> _______________________________________________ >>> Tigervnc-devel mailing list >>> Tigervnc-devel@lists.sourceforge.net >>> https://lists.sourceforge.net/lists/listinfo/tigervnc-devel >> ------------------------------------------------------------------------------ >> >> WhatsUp Gold - Download Free Network Management Software >> The most intuitive, comprehensive, and cost-effective network >> management toolset available today. Delivers lowest initial >> acquisition cost and overall TCO of any competing solution. >> http://p.sf.net/sfu/whatsupgold-sd >> _______________________________________________ >> Tigervnc-devel mailing list >> Tigervnc-devel@lists.sourceforge.net >> https://lists.sourceforge.net/lists/listinfo/tigervnc-devel > ------------------------------------------------------------------------------ WhatsUp Gold - Download Free Network Management Software The most intuitive, comprehensive, and cost-effective network management toolset available today. Delivers lowest initial acquisition cost and overall TCO of any competing solution. http://p.sf.net/sfu/whatsupgold-sd _______________________________________________ Tigervnc-devel mailing list Tigervnc-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/tigervnc-devel
