1. 10 Jul, 2006 1 commit
  2. 01 Mar, 2006 1 commit
  3. 18 Feb, 2006 1 commit
    • Eric Wong's avatar
      archimport: remove files from the index before adding/updating · 3ff903bf
      Eric Wong authored
      This fixes a bug when importing where a directory gets removed/renamed
      but is immediately replaced by a file of the same name in the same
      changeset.
      
      This fix only applies to the accurate (default) strategy the moment.
      
      This patch should also fix the fast strategy if/when it is updated
      to handle the cases that would've triggered this bug.
      
      This bug was originally found in git-svn, but I remembered I did the
      same thing with archimport as well.
      Signed-off-by: default avatarEric Wong <normalperson@yhbt.net>
      Signed-off-by: default avatarJunio C Hamano <junkio@cox.net>
      3ff903bf
  4. 19 Dec, 2005 1 commit
  5. 11 Dec, 2005 9 commits
  6. 17 Nov, 2005 5 commits
  7. 16 Nov, 2005 1 commit
  8. 11 Nov, 2005 1 commit
  9. 02 Oct, 2005 1 commit
  10. 11 Sep, 2005 3 commits
  11. 10 Sep, 2005 1 commit
    • martin@catalyst.net.nz's avatar
      [PATCH] archimport - add merge detection · b779d5f0
      martin@catalyst.net.nz authored
      We now keep track of the patches merged in each branch since they have
      diverged, using the records that the Arch "logs" provide. Merge parents
      for a commit are defined if we are merging a series of patches that starts
      from the mergebase.
      
      If patches from a related branch are merged out-of-order, we keep track of
      how much has been merged sequentially -- the tip of that sequential merge
      is our new parent from that branch.
      
      This mechanism works very well for branches that merge in dovetail and/or
      flying fish patterns, probably less well for others.
      Signed-off-by: default avatarMartin Langhoff <martin@catalyst.net.nz>
      Signed-off-by: default avatarJunio C Hamano <junkio@cox.net>
      b779d5f0
  12. 08 Sep, 2005 1 commit
    • Junio C Hamano's avatar
      Big tool rename. · 215a7ad1
      Junio C Hamano authored
      As promised, this is the "big tool rename" patch.  The primary differences
      since 0.99.6 are:
      
        (1) git-*-script are no more.  The commands installed do not
            have any such suffix so users do not have to remember if
            something is implemented as a shell script or not.
      
        (2) Many command names with 'cache' in them are renamed with
            'index' if that is what they mean.
      
      There are backward compatibility symblic links so that you and
      Porcelains can keep using the old names, but the backward
      compatibility support  is expected to be removed in the near
      future.
      Signed-off-by: default avatarJunio C Hamano <junkio@cox.net>
      215a7ad1
  13. 04 Sep, 2005 2 commits
  14. 30 Aug, 2005 1 commit
    • Martin Langhoff's avatar
      [PATCH] Initial import of git-archimport-script · d3968363
      Martin Langhoff authored
      Imports a project history from one or more Arch repositories, following
      the branching and tagging across repositories. Note you should import
      separate projects to separate GIT repositories.
      
      Supported
       - Imports, tags and simple commits.
       - File renames
       - Arch tags
       - Binary files
       - Large trees
       - Multiple repositories
       - Branches
      
      TODO:
       - Allow re-running the import on an already-imported project
       - Follow merges using Arch data
       - Audit shell escaping of filenames
       - Better support for file metadata
       - Better/safer creation of temp directories
      
      Unsupported:
       - Arch 'configuration'
      
      [jc: my arch/tla is very rusty and after Tom announced he is stepping
       down as the maintainer I have very little motivation to relearn it,
       so I would appreciate if people discuss any bugs or enhancements
       directly with Martin.  Of course I can help with the git end of the
       issues.]
      Signed-off-by: default avatarMartin Langhoff <martin@catalyst.net.nz>
      Signed-off-by: default avatarJunio C Hamano <junkio@cox.net>
      d3968363