[tools-issues] [Issue 97012] cws rebase silently loses modifications to moved files
To comment on the following update, log in, then open the issue: http://www.openoffice.org/issues/show_bug.cgi?id=97012 User hr changed the following: What|Old value |New value Status|STARTED |RESOLVED Resolution| |FIXED --- Additional comments from h...@openoffice.org Wed Mar 24 15:45:35 + 2010 --- The problem has been solved by migrating our major codelines to Mercurial. For the record: this issue was one of major but certainly not the only reason why we migrated away from SVN. - Please do not reply to this automatically generated notification from Issue Tracker. Please log onto the website and enter your comments. http://qa.openoffice.org/issue_handling/project_issues.html#notification - To unsubscribe, e-mail: issues-unsubscr...@tools.openoffice.org For additional commands, e-mail: issues-h...@tools.openoffice.org - To unsubscribe, e-mail: allbugs-unsubscr...@openoffice.org For additional commands, e-mail: allbugs-h...@openoffice.org
[tools-issues] [Issue 97012] cws rebase silently loses modifications to moved files
To comment on the following update, log in, then open the issue: http://www.openoffice.org/issues/show_bug.cgi?id=97012 User hr changed the following: What|Old value |New value Status|RESOLVED |CLOSED --- Additional comments from h...@openoffice.org Wed Mar 24 15:46:31 + 2010 --- Close issue. - Please do not reply to this automatically generated notification from Issue Tracker. Please log onto the website and enter your comments. http://qa.openoffice.org/issue_handling/project_issues.html#notification - To unsubscribe, e-mail: issues-unsubscr...@tools.openoffice.org For additional commands, e-mail: issues-h...@tools.openoffice.org - To unsubscribe, e-mail: allbugs-unsubscr...@openoffice.org For additional commands, e-mail: allbugs-h...@openoffice.org
[tools-issues] [Issue 97012] cws rebase silently loses modifications to moved files
To comment on the following update, log in, then open the issue: http://www.openoffice.org/issues/show_bug.cgi?id=97012 --- Additional comments from [EMAIL PROTECTED] Wed Dec 10 11:53:47 + 2008 --- @stsp: Thank you very much for stepping into this discussion, this is a problem which is very important for us. I'll bring myself up to date with the references you've added and will certainly try out our workflow with the Subversion trunk and report back to this issue and the Subversion developer list. One short explanation to what is meant with cws rebase: A CWS is basically a feature branch (with some associated metadata), branched off the trunk at a certain revision. A cws rebase is a simple merge from newer trunk revisions into the feature branch. The branch is then later reintegrated into the trunk with svn merge --reintegrate, an operation which is incidentally called cws integrate. We have always hundreds of open CWSs and dozens of integrations per build. Our problem with svn move is exactly the one which is described in the Subversion book. - Please do not reply to this automatically generated notification from Issue Tracker. Please log onto the website and enter your comments. http://qa.openoffice.org/issue_handling/project_issues.html#notification - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[tools-issues] [Issue 97012] cws rebase silently loses modifications to moved files
To comment on the following update, log in, then open the issue: http://www.openoffice.org/issues/show_bug.cgi?id=97012 --- Additional comments from [EMAIL PROTECTED] Tue Dec 9 21:54:24 + 2008 --- Some comments from a Subversion developer. Hopefully this information will help you guys. This really is the behaviour of 'svn move' as implemented. We know this sucks in many situations. The 1.6 release will feature 'tree-conflict detection', a feature which is supposed to address this and a whole class of similar problems. I'm not really sure what you do during a 'rebase' and what the cws tool is, so it might be that the issues we are trying to fix with this feature are orthogonal to your problem. But I hope that's not the case. Some background reading: Slides for a talk I did with a fellow svn developer at Subconf: http://www.subconf.de/fileadmin/PDF_Dateien/SubConf/SubConf_2008/Vortraege/Stephen_Butler_und_Stefan_Sperling.pdf Slides for a talk at Subconf held by a corporate Subversion user with extreme branching and merging requirements, about their (temporary) workaround for problems with svn move: http://www.subconf.de/fileadmin/PDF_Dateien/SubConf/SubConf_2008/Vortraege/Nico_Schellingerhout1.pdf Unfortunately, we're currently lacking decent documentation for tree conflicts. Much information is scattered on the mailing list and in our issue tracker. The svnbook will eventually be updated, I'm working on this. These two posts may give you a good idea about what this feature does: http://subversion.tigris.org/ds/viewMessage.do?dsMessageId=98875dsForumId=462 http://subversion.tigris.org/ds/viewMessage.do?dsMessageId=99602dsForumId=462 If you really want to dig deep, here is the mother issue in our issue tracker: http://subversion.tigris.org/issues/show_bug.cgi?id=2282 Most importantly, if you can, *please* *please* *please* try your problematic merge cases with current Subversion trunk, and report to us on our development mailing list (see http://subversion.tigris.org/mailing-lists.html) whether you like what you see or not. (It's all client-side, not need to upgrade the server.) That would help us an awful lot. Thanks! - Please do not reply to this automatically generated notification from Issue Tracker. Please log onto the website and enter your comments. http://qa.openoffice.org/issue_handling/project_issues.html#notification - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[tools-issues] [Issue 97012] cws rebase silently loses modifications to moved files
To comment on the following update, log in, then open the issue: http://www.openoffice.org/issues/show_bug.cgi?id=97012 User stsp changed the following: What|Old value |New value CC|'b_michaelsen,pl,rene'|'b_michaelsen,pl,rene,stsp | |' - Please do not reply to this automatically generated notification from Issue Tracker. Please log onto the website and enter your comments. http://qa.openoffice.org/issue_handling/project_issues.html#notification - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[tools-issues] [Issue 97012] cws rebase silently loses modifications to moved files
To comment on the following update, log in, then open the issue: http://www.openoffice.org/issues/show_bug.cgi?id=97012 User rene changed the following: What|Old value |New value CC|''|'rene' --- Additional comments from [EMAIL PROTECTED] Mon Dec 8 13:14:03 + 2008 --- yes, had the same issue with configuretoplevel (which did svn mv config_office/* .) and I needed to merge the config_office changes manually, - Please do not reply to this automatically generated notification from Issue Tracker. Please log onto the website and enter your comments. http://qa.openoffice.org/issue_handling/project_issues.html#notification - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[tools-issues] [Issue 97012] cws rebase silently loses modifications to moved files
To comment on the following update, log in, then open the issue: http://www.openoffice.org/issues/show_bug.cgi?id=97012 User hr changed the following: What|Old value |New value Status|NEW |STARTED --- Additional comments from [EMAIL PROTECTED] Mon Dec 8 13:24:50 + 2008 --- Well, this is svn behavior as documented in the svn book, so what do you think I can can do about this? Well I could maybe disable svn move in the pre-commit-hook but before I do this the developer community should make up it's mind if it's never ever wants anyone do a svn move or if it good enough to educate people about the dangers of svn move. I will check out if there is a warning mechanism possible. Downgraded to Prio 2. @pl: Could you please comment this? I know your stand point is different on this issue than Franks or Stefans. - Please do not reply to this automatically generated notification from Issue Tracker. Please log onto the website and enter your comments. http://qa.openoffice.org/issue_handling/project_issues.html#notification - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[tools-issues] [Issue 97012] cws rebase silently loses modifications to moved files
To comment on the following update, log in, then open the issue: http://www.openoffice.org/issues/show_bug.cgi?id=97012 User hr changed the following: What|Old value |New value Priority|P1|P2 --- Additional comments from [EMAIL PROTECTED] Mon Dec 8 13:25:04 + 2008 --- . - Please do not reply to this automatically generated notification from Issue Tracker. Please log onto the website and enter your comments. http://qa.openoffice.org/issue_handling/project_issues.html#notification - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[tools-issues] [Issue 97012] cws rebase silently loses modifications to moved files
To comment on the following update, log in, then open the issue: http://www.openoffice.org/issues/show_bug.cgi?id=97012 --- Additional comments from [EMAIL PROTECTED] Mon Dec 8 13:45:36 + 2008 --- Actually, I think the situation is not as bad as we might think. See: http://subversion.tigris.org/svn_1.5_releasenotes.html#copy-move-improvements I have not tried this out, but if svn update really works as described in the release notes may work for us. - Please do not reply to this automatically generated notification from Issue Tracker. Please log onto the website and enter your comments. http://qa.openoffice.org/issue_handling/project_issues.html#notification - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[tools-issues] [Issue 97012] cws rebase silently loses modifications to moved files
To comment on the following update, log in, then open the issue: http://www.openoffice.org/issues/show_bug.cgi?id=97012 --- Additional comments from [EMAIL PROTECTED] Mon Dec 8 13:45:59 + 2008 --- @hr: Disabling the ability to move (i.e., add and delete) files is certainly not an option. What is necessary is to augment the cws tooling with a mechanism that warns about modifications to deleted files upon CWS rebasing and integration, just like the old CVS/CWS tooling did. - Please do not reply to this automatically generated notification from Issue Tracker. Please log onto the website and enter your comments. http://qa.openoffice.org/issue_handling/project_issues.html#notification - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[tools-issues] [Issue 97012] cws rebase silently loses modifications to moved files
To comment on the following update, log in, then open the issue: http://www.openoffice.org/issues/show_bug.cgi?id=97012 Issue #|97012 Summary|cws rebase silently loses modifications to moved files Component|tools Version|DEV300m36 Platform|All URL| OS/Version|All Status|NEW Status whiteboard| Keywords| Resolution| Issue type|DEFECT Priority|P1 Subcomponent|code Assigned to|hr Reported by|sb --- Additional comments from [EMAIL PROTECTED] Mon Dec 8 12:19:45 + 2008 --- see thread at http://www.openoffice.org/servlets/ReadMsg?list=devmsgNo=23807 (IIUC, loss will not only happen during cws rebase, but also during CWS integration) - Please do not reply to this automatically generated notification from Issue Tracker. Please log onto the website and enter your comments. http://qa.openoffice.org/issue_handling/project_issues.html#notification - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[tools-issues] [Issue 97012] cws rebase silently loses modifications to moved files
To comment on the following update, log in, then open the issue: http://www.openoffice.org/issues/show_bug.cgi?id=97012 --- Additional comments from [EMAIL PROTECTED] Mon Dec 8 13:58:22 + 2008 --- How about this: For rebasing: - when creating a milestone, we generate a list of files missing from the previous milestone (those might have been moved) - before a cws is rebased, cws rebase checks if any of the files in the deleted files list contain cws-local changes since the last rebase. If so, it warns about possible data loss. For reintegration: - when a cws goes ready for qa a list of files missing compared to the current master is created - when may missing file contains changes on the master from the time the cws was branched, a warning is issued regarding possible data loss. This isnt 100% foolproof as a file might have moved and a new file may occupy its old location, but it gives some hints at least ... - Please do not reply to this automatically generated notification from Issue Tracker. Please log onto the website and enter your comments. http://qa.openoffice.org/issue_handling/project_issues.html#notification - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[tools-issues] [Issue 97012] cws rebase silently loses modifications to moved files
To comment on the following update, log in, then open the issue: http://www.openoffice.org/issues/show_bug.cgi?id=97012 User hr changed the following: What|Old value |New value CC|'rene'|'pl,rene' --- Additional comments from [EMAIL PROTECTED] Mon Dec 8 14:33:23 + 2008 --- add pl to CC as he has an interest in this. - Please do not reply to this automatically generated notification from Issue Tracker. Please log onto the website and enter your comments. http://qa.openoffice.org/issue_handling/project_issues.html#notification - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[tools-issues] [Issue 97012] cws rebase silently loses modifications to moved files
To comment on the following update, log in, then open the issue: http://www.openoffice.org/issues/show_bug.cgi?id=97012 --- Additional comments from [EMAIL PROTECTED] Mon Dec 8 14:35:28 + 2008 --- http://subversion.tigris.org/issues/show_bug.cgi?id=2685 related subversion issue - Please do not reply to this automatically generated notification from Issue Tracker. Please log onto the website and enter your comments. http://qa.openoffice.org/issue_handling/project_issues.html#notification - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[tools-issues] [Issue 97012] cws rebase silently loses modifications to moved files
To comment on the following update, log in, then open the issue: http://www.openoffice.org/issues/show_bug.cgi?id=97012 --- Additional comments from [EMAIL PROTECTED] Mon Dec 8 14:37:02 + 2008 --- I just checked out the actual behavior (svn-1.5.4): 1) Move file in trunk, changed file in CWS, rebase: - change in CWS is undone 2) Move file in CWS, changed file in trunk, reintegrate: - svn merge --reintegrate fails, 2 URL version undoes the change. Whatever they did in svn-1.5, they did not do what they described in their release notes. - Please do not reply to this automatically generated notification from Issue Tracker. Please log onto the website and enter your comments. http://qa.openoffice.org/issue_handling/project_issues.html#notification - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[tools-issues] [Issue 97012] cws rebase silently loses modifications to moved files
To comment on the following update, log in, then open the issue: http://www.openoffice.org/issues/show_bug.cgi?id=97012 --- Additional comments from [EMAIL PROTECTED] Mon Dec 8 14:44:21 + 2008 --- @hr: I think the stuff in the release notes is only about changes to a working copy (e.g. on the client) - not between (serverside) branches. - Please do not reply to this automatically generated notification from Issue Tracker. Please log onto the website and enter your comments. http://qa.openoffice.org/issue_handling/project_issues.html#notification - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[tools-issues] [Issue 97012] cws rebase silently loses modifications to moved files
To comment on the following update, log in, then open the issue: http://www.openoffice.org/issues/show_bug.cgi?id=97012 User b_michaelsen changed the following: What|Old value |New value CC|'pl,rene' |'b_michaelsen,pl,rene' --- Additional comments from [EMAIL PROTECTED] Mon Dec 8 14:45:08 + 2008 --- cc'ing myself. - Please do not reply to this automatically generated notification from Issue Tracker. Please log onto the website and enter your comments. http://qa.openoffice.org/issue_handling/project_issues.html#notification - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[tools-issues] [Issue 97012] cws rebase silently loses modifications to moved files
To comment on the following update, log in, then open the issue: http://www.openoffice.org/issues/show_bug.cgi?id=97012 --- Additional comments from [EMAIL PROTECTED] Mon Dec 8 14:52:40 + 2008 --- @hr,b_michaelsen: To avoid confusion, just want to point out that my original scenario (move on CWS, change on trunk, CWS rebase does not notice trunk changes) is related to, but slightly different from the scenarios you appear to be concentrating on in your last few comments. - Please do not reply to this automatically generated notification from Issue Tracker. Please log onto the website and enter your comments. http://qa.openoffice.org/issue_handling/project_issues.html#notification - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[tools-issues] [Issue 97012] cws rebase silently loses modifications to moved files
To comment on the following update, log in, then open the issue: http://www.openoffice.org/issues/show_bug.cgi?id=97012 --- Additional comments from [EMAIL PROTECTED] Mon Dec 8 15:18:10 + 2008 --- There are at least three scenarios: Scenario I: - move on cws - change on trunk - rebase - trunk changes ignored Scenario II: - move on cws - reintegrate - trunk changes from last rebase before move ignored/reverted Scenario III: - change on cws - move on trunk - rebase - cws changes ignored/reverted An clumsy way to solve this would be to create a svn property milestone set on every file on every milestone to something like DEV300_mXX Upon cws create those properties are set to cws or cleared. After a rebase, one could identify files (from Scenario III) moved on master by their milestone tag. Those files would need to be examined, conflicts need to be resolved and the milestone property would need to be set to cws again. This would work the same way for Scenario II. Still, it wouldnt solve Scenario I, and emulating cvs tags like that probably would result in a huge performance hit. - Please do not reply to this automatically generated notification from Issue Tracker. Please log onto the website and enter your comments. http://qa.openoffice.org/issue_handling/project_issues.html#notification - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
