Well, I usually do this for medium-length "deviations from trunk".
"patch -p0 < patch" and "patch -p0 -R < patch" do a good job of merging and un-merging my changes. I tend to unmerge my changes, svn update and then re-merge my changes each morning. Any failed patch hunks are places that would have been conflicts in an SVN merge (generally) so I just resolve them manually and then re-create my patch. I suppose this becomes really hard if you're tracking more than one set of changes (particularly if they interfere with each other, like the UpdateGSAction.java changes I was tracking the other week). Anyway, that's what I do when my changes are all part of a "unified whole" and they fit nicely inside a patch. In any case, I'd support your staying on trunk if there's any option of doing so. Merging and branching are a pain, and it's easy to have stuff get left "out there" or get stressful at times when it's most needed. --saul On Thu, 2008-01-24 at 08:29 +0100, Andrea Aime wrote: > Saul Farber ha scritto: > > Can you maintain the OWS5-based changes as diffs? > > Hum... no, I don't think so. That may make development > even messier than having multiple branches. Are you used > to work this way? How do you approach the problem of > keeping diffs around, removing them, readding them, > sharing with other developers? > > > Or can you promise to > > merge in changes from the trunk to your branch every day or something? > > Neither, I would have to branch geoserver as well to follow > the gt2 branch. Wheter I'll be able to keep both in synch > with the rest of developers remains to be seen. > > Cheers > Andrea > > ------------------------------------------------------------------------- > This SF.net email is sponsored by: Microsoft > Defy all challenges. Microsoft(R) Visual Studio 2008. > http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ > _______________________________________________ > Geotools-devel mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/geotools-devel ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ _______________________________________________ Geotools-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/geotools-devel
