This was human error, MINE not an problem with SVN itself. I messed up
on how I did the merge I think what happened is that when I defined the
merge is that I specified the wrong start point so SVN then detected the
changes incorrectly. When you do a merge it only updates your local copy
and then you can review. I did not completely check things before I did
the commit. I caught some of it but not all.
When you do a SVN up it will delete local copies of a file which is why
normally I do a synchronization to see what has changed
I think the way to prevent this is as follows
* Avoid branch/merge unless we can come up with a rock solid set of
guidelines to avoid these issues.
* Before checking code in do a SVN update to ensure you have the
latest code (which I did do before the merge
I feel bad for the extra work I've caused you guys.
Paul
Larry Becker wrote:
> @Stefan: Unfortunately, the ChangeLog is one of the files overwritten.
>
> @Andreas: I would think that we would lose more work reverting the
> merge than I lost. It will just take me some time to find and merge
> all my recent changes back. Fortunately, there is the email
> svn-commit-notification.
>
> About SVN, it sounds like you have had problems with it the past. The
> fact that it deleted my local copies (with history) from my hard drive
> has convinced me that it is not to be trusted. I didn't get a single
> notification that this was happening. The only command I issued from
> the synchonization view was Update, and I never saw my class files in
> the update list.
>
> You may disagree, but what is your alternative to prevent this from
> happening in the future?
>
> Larry
>
> On 10/15/07, Andreas Schmitz <[EMAIL PROTECTED]> wrote:
>
>> Stefan Steiniger wrote:
>>
>> Hi,
>>
>>
>>> so we now need to figure out which mods have been the last.
>>> If the re-versal has been applied to all the openjump core code-base we
>>> may have a look on the change-log file
>>>
>> we could also try to revert to the last revision before the merge, then redo
>> the
>> merge (without breaking it again of course...).
>>
>>
>>>> It looks like all recent changes were overwritten during the branch merge.
>>>>
>>>> I'm amazed that this could happen, and I don't think the Eclipse
>>>> client can be blamed for all of the problems. It should be just a GUI
>>>> front end to a command line client. I do think there is a lesson here
>>>>
>> The keywords here are "should be". The command line version does for example
>> not
>> need "synchronizing" or updating after committing, yet the GUI client
>> enforces
>> this (and still creates problems).
>>
>>
>>>> regarding our switch from CVS to SVN: don't fix something that isn't
>>>> broken.
>>>>
>> Well, here we strongly disagree ;-) I for one am still happy that we switched
>> (but none of my changes had been overwritten, so...).
>>
>> If you'd like, I can try to revert the changes made by the merge tomorrow.
>>
>> 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
>>
>>
>> -----BEGIN PGP SIGNATURE-----
>> Version: GnuPG v1.4.6 (GNU/Linux)
>>
>> iD8DBQFHE3Vf737OVr+Ru7oRAmnxAJ4yCAWxpGhsCpyBoQvqBR5NqfZqjwCgpKQP
>> 78UHo0jCwxJQJS3WCZfeLMU=
>> =VdFc
>> -----END PGP 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
>>
>>
>>
>
>
>
-------------------------------------------------------------------------
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
