Skip to content
Snippets Groups Projects
  1. Aug 23, 2007
  2. Aug 19, 2007
  3. Aug 18, 2007
  4. Aug 16, 2007
  5. Aug 15, 2007
  6. Aug 02, 2007
  7. Aug 14, 2007
  8. Aug 13, 2007
  9. Aug 12, 2007
    • Alexis S. L. Carvalho's avatar
      merge: fix a copy detection bug (issue672) · ad6b9713
      Alexis S. L. Carvalho authored
      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.
      ad6b9713
  10. Aug 11, 2007
  11. Aug 09, 2007
  12. Aug 08, 2007
  13. Aug 07, 2007
  14. Aug 06, 2007
    • Thomas Arendsen Hein's avatar
      Update on pull -u when heads were closed (fixes issue666). · 73fdc8bd
      Thomas Arendsen Hein authored
      Patch written by Benoit Boissinot.
      
      This should probably be improved in the future to handle long-living
      branches, as joining two "other" heads will switch to that new head.
      But this is not a new problem, as adding to the "other" head would have
      switched to that new head, too.
      73fdc8bd
  15. Jul 06, 2007
Loading