| Merge/Commit oddity. [message #17202] |
Thu, 24 April 2008 09:18  |
Eclipse User |
|
|
|
Originally posted by: dcorbin.allureglobal.com
We saw something today that was "most wierd", and fairly disconcerting.
Here's what happened.
1) We synchronized. - we had one conflicting file, with conflicting "areas"
in the file.
2) We updated all the files. The synchronize view (incoming)went empty. A
short while later, we noticed the "conflict view" had one file in it, and
sure enough, it was the file we'd seen in incoming as a conflict.
3) We manually merged the file, and "Marked it as Merged".
4) We committed all our outstanding changes.
5) 30 minutes later we find out that the "conflict file" had not been
committed. But Subversive and svn (commandline) showed no differences
between our version and HEAD, but there was no history showing our commit
on /that/ file. All other files had been committed.
6) We made a trivial change to the conflicting file, and suddenly
there /were/ many differences.
We committed and everything is now back to normal, but this is very
disconcerting. I'm not sure where the problem is, but I will say our
experience with Subversive and conflicting has not been great. The fact
that an update is not auto-merging changes when there are not "area
conflicts" is bad, but the fact that it doesn't update the file and gives
no error is REALLY bad.
David
|
|
|
| Re: Merge/Commit oddity. [message #17774 is a reply to message #17202] |
Fri, 25 April 2008 10:19  |
| Eclipse User |
|
|
|
Originally posted by: alexander.gurov.polarion.org
Dear David,
it's a very strange situation, but it can relate to our well known bug.
The bug sense is that after a conflict merging and switching the mode some
files in some strange way dissappear from the view, so they are not
commited after pressing "Commit all outgoing".
The way to se it in the synch view again is to change modes one more time.
We are working on it, so it's highly recommended now to "reclick" the view
after any scope commit...
David Corbin wrote:
> We saw something today that was "most wierd", and fairly disconcerting.
> Here's what happened.
> 1) We synchronized. - we had one conflicting file, with conflicting "areas"
> in the file.
> 2) We updated all the files. The synchronize view (incoming)went empty. A
> short while later, we noticed the "conflict view" had one file in it, and
> sure enough, it was the file we'd seen in incoming as a conflict.
> 3) We manually merged the file, and "Marked it as Merged".
> 4) We committed all our outstanding changes.
> 5) 30 minutes later we find out that the "conflict file" had not been
> committed. But Subversive and svn (commandline) showed no differences
> between our version and HEAD, but there was no history showing our commit
> on /that/ file. All other files had been committed.
> 6) We made a trivial change to the conflicting file, and suddenly
> there /were/ many differences.
> We committed and everything is now back to normal, but this is very
> disconcerting. I'm not sure where the problem is, but I will say our
> experience with Subversive and conflicting has not been great. The fact
> that an update is not auto-merging changes when there are not "area
> conflicts" is bad, but the fact that it doesn't update the file and gives
> no error is REALLY bad.
> David
|
|
|
Powered by
FUDForum. Page generated in 0.03565 seconds
Home