[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
[stellation-res] Need help finding merge problems
|
In the course of doing the mirroring, I've been doing a lot of merges
of Stellation projects. Every once in a while, on a repeated merge, I'll
get a spurious merge error.
The merge error always seems to occur by claiming a conflict in
merging into an unchanged file. It often results in other errors in
the merged files, usually omitting changes that were supposed to
be merged in.
I've never been able to reproduce the error. Using the restore command
and then remerging seems to generate correct results.
If you see this error, please let me know. I'm trying to gather
enough data to figure out what's going on, so that I can
find a way to capture it in reproducable form.
I suspect that part of the source of the error involves Eclipse touching
the file in some way... I've been using lots of workspaces, and
only the workspaces that I've accessed with Eclipse seem to
exhibit this problem.
-Mark
a copy of the file containing the bad merge, and a copy of the file
from before the merge.
--
Mark Craig Chu-Carroll, IBM T.J. Watson Research Center
*** The Stellation project: Advanced SCM for Collaboration
*** http://www.eclipse.org/stellation
*** Work Email: mcc@xxxxxxxxxxxxxx ------- Personal Email: markcc@xxxxxxxxxxx
