| commit | 6ba612efffba42bec102ac58a1540496158f747e | [log] [tgz] |
|---|---|---|
| author | Andrew Sapperstein <asapperstein@google.com> | Mon Jun 20 18:41:24 2011 -0700 |
| committer | Andrew Sapperstein <asapperstein@google.com> | Tue Jun 21 12:05:39 2011 -0700 |
| tree | 18b9f4c6a04d924699c73101b07fa6a4b871cfef | |
| parent | d6eaacbb9eb56763d38a3815fc509b92ed98a585 [diff] |
Parsing entire tree and resolving all conflicts. Unfortunately, this takes 3 passes (1 parse and 2 resolve passes) due to one corner case (where you refer to something that is inside a superclass that is in a different package). Fortunately, there are only 3 or 4 resolutions on the third pass. Change-Id: I14dc6e61e002058132b8065a7b31abb87ac8f2a1