mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' into checkout

Browse source 
Conflicts:
	debian/changelog
	doc/backends.mdwn
This commit is contained in:
Joey Hess 2010-11-09 15:05:08 -04:00
commit 75d2925082
30 changed files with 343 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

13
debian/changelog vendored
View file

@ -3,8 +3,19 @@ git-annex (0.04) UNRELEASED; urgency=low
* Add checkout subcommand, which allows checking out file content
in preparation of changing it.
* Add uncheckout subcommand.
* Add build dep on libghc6-testpack-dev.
* Add annex.version, which will be used to automate upgrades
between incompatable versions.
* Reorganised the layout of .git/annex/
* The new layout will be automatically upgraded to the first time
git-annex is used in a repository with the old layout.
* Note that git-annex 0.04 cannot transfer content from old repositories
that have not yet been upgraded.
* Annexed file contents are now made unwritable and put in unwriteable
directories, to avoid them accidentially being removed or modified.
(Thanks Josh Triplett for the idea.)
-- Joey Hess <joeyh@debian.org> Sun, 07 Nov 2010 21:01:29 -0400
-- Joey Hess <joeyh@debian.org> Mon, 08 Nov 2010 12:36:39 -0400
git-annex (0.03) unstable; urgency=low

2
debian/control vendored
View file

@ -1,7 +1,7 @@
Source: git-annex
Section: utils
Priority: optional
Build-Depends: debhelper (>= 7.0.50), ghc6, libghc6-missingh-dev, ikiwiki
Build-Depends: debhelper (>= 7.0.50), ghc6, libghc6-missingh-dev, libghc6-testpack-dev, ikiwiki
Maintainer: Joey Hess <joeyh@debian.org>
Standards-Version: 3.9.1
Vcs-Git: git://git.kitenet.net/git-annex