Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-push-http.out @ 5149:ad6b97132b81
merge: fix a copy detection bug (issue672)
When merging rev1 and rev2, we want to search for copies that happened
in rev1 but not in rev2 and vice-versa. We were starting the search at
rev1/rev2 and then going back, stopping as soon as we reached the revno
of the ancestor, but that can miss some cases (see the new
test-issue672).
Now we calculate the revisions that are ancestors of rev1 or rev2 (but
not both) and make sure the search doesn't stop too early.
Simplified test provided by mpm, based on a test case provided by
Edward Lee.
| author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
|---|---|
| date | Sun, 12 Aug 2007 12:15:10 -0300 |
| parents | 8a3e12426c03 |
| children | e3a0c092b4e2 |
line wrap: on
line source
adding a 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % expect ssl error pushing to http://localhost:20059/ searching for changes ssl required % expect authorization error pushing to http://localhost:20059/ searching for changes push not authorized % expect authorization error: must have authorized user pushing to http://localhost:20059/ searching for changes push not authorized % expect success pushing to http://localhost:20059/ searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files rolling back last transaction changegroup hook: HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve HG_URL=remote:http % expect authorization error: all users denied pushing to http://localhost:20059/ searching for changes push not authorized % expect authorization error: some users denied, users must be authenticated pushing to http://localhost:20059/ searching for changes push not authorized