Larry Becker wrote: Hi,
> Yes, it appears that 1138 contains sufficient information to reapply > my changes. I'll try to get to it tonight (Florida time). > > I took a peek at the subversion manual to see if I could try to > understand the problem, and it seems very complex. The section on > branching and merging was full of warnings about possible problems. > Of course, they are talking about the command line client, so I'm not > sure how relevant the docs really are. There doesn't seem to be any > way to do a Tag, which I thought was one of the best features of CVS. > Oh well, at least it is fast. > > I certainly don't hold Sunburned or Paul responsible for the problem. > It may be a human error, but isn't that what GUI's are supposed to > prevent? Well, I agree that a GUI is supposed to work like that. But as we all know, GUIs require a lot of work to make them perfect. Anyway, as to branch management in subversion, this link will help: http://www.orcaware.com/svn/wiki/Svnmerge.py svnmerge.py is a tool that automatically takes care of the problem that Paul probably had - the entry point of the merging process. It automatically remembers which changes are already integrated and which not. After setting the tool up as described in the documentation, the merge process works like that: * in a local (clean) copy of the trunk, you do a "svnmerge.py". * this integrates changes in the branch into the local copy. If there are conflicts, you can resolve them locally. Note that only changes are pulled which have not been integrated yet. * After resolving the conflicts, one can commit the merged trunk tree. An appropriate commit message has already been created. I've never had any problems with subversion or svnmerge.py. The only problems I had have been with the Subclipse client. Best regards, Andreas -- l a t / l o n GmbH Aennchenstrasse 19 53177 Bonn, Germany phone ++49 +228 18496-11 fax ++49 +228 1849629 http://www.lat-lon.de http://www.deegree.org
signature.asc
Description: Digital signature
------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________ Jump-pilot-devel mailing list Jump-pilot-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
