oops
This commit is contained in:
parent
9c04d1e523
commit
402d9c7c5f
1 changed files with 6 additions and 30 deletions
36
debian/changelog
vendored
36
debian/changelog
vendored
|
@ -1,28 +1,5 @@
|
||||||
git-annex (3.20110929) UNRELEASED; urgency=low
|
git-annex (3.20110929) UNRELEASED; urgency=low
|
||||||
|
|
||||||
<<<<<<<
|
|
||||||
* Fix referring to remotes by uuid.
|
|
||||||
* New or changed repository descriptions in uuid.log now have a timestamp,
|
|
||||||
which is used to ensure the newest description is used when the uuid.log
|
|
||||||
has been merged.
|
|
||||||
* Note that older versions of git-annex will display the timestamp as part
|
|
||||||
of the repository description, which is ugly but otherwise harmless.
|
|
||||||
* Add timestamps to trust.log and remote.log too.
|
|
||||||
* git-annex-shell: Added the --uuid option.
|
|
||||||
* git-annex now asks git-annex-shell to verify that it's operating in
|
|
||||||
the expected repository.
|
|
||||||
* Note that this git-annex will not interoperate with remotes using
|
|
||||||
older versions of git-annex-shell.
|
|
||||||
* Now supports git's insteadOf configuration, to modify the url
|
|
||||||
used to access a remote. Note that pushInsteadOf is not used;
|
|
||||||
that and pushurl are reserved for actual git pushes. Closes: #644278
|
|
||||||
* status: List all known repositories.
|
|
||||||
* When displaying a list of repositories, show git remote names
|
|
||||||
in addition to their descriptions.
|
|
||||||
* Add locking to avoid races when changing the git-annex branch.
|
|
||||||
* Various speed improvements gained by using ByteStrings.
|
|
||||||
* Contain the zombie hordes.
|
|
||||||
=======
|
|
||||||
* This version of git-annex only works with git 1.7.7 and newer.
|
* This version of git-annex only works with git 1.7.7 and newer.
|
||||||
The breakage with old versions is subtle, and affects
|
The breakage with old versions is subtle, and affects
|
||||||
annex.numcopies .gitattributes settings, so be sure to upgrade git
|
annex.numcopies .gitattributes settings, so be sure to upgrade git
|
||||||
|
@ -30,13 +7,7 @@ git-annex (3.20110929) UNRELEASED; urgency=low
|
||||||
* Don't pass absolute paths to git show-attr, as it started following
|
* Don't pass absolute paths to git show-attr, as it started following
|
||||||
symlinks when that's done in 1.7.7. Instead, use relative paths,
|
symlinks when that's done in 1.7.7. Instead, use relative paths,
|
||||||
which show-attr only handles 100% correctly in 1.7.7. Closes: #645046
|
which show-attr only handles 100% correctly in 1.7.7. Closes: #645046
|
||||||
* Various speed improvements gained by using ByteStrings.
|
|
||||||
* Fix referring to remotes by uuid.
|
* Fix referring to remotes by uuid.
|
||||||
* status: List all known repositories.
|
|
||||||
* When displaying a list of repositories, show git remote names
|
|
||||||
in addition to their descriptions.
|
|
||||||
* Contain the zombie hordes.
|
|
||||||
* Add locking to avoid races when changing the git-annex branch.
|
|
||||||
* New or changed repository descriptions in uuid.log now have a timestamp,
|
* New or changed repository descriptions in uuid.log now have a timestamp,
|
||||||
which is used to ensure the newest description is used when the uuid.log
|
which is used to ensure the newest description is used when the uuid.log
|
||||||
has been merged.
|
has been merged.
|
||||||
|
@ -51,7 +22,12 @@ git-annex (3.20110929) UNRELEASED; urgency=low
|
||||||
* Now supports git's insteadOf configuration, to modify the url
|
* Now supports git's insteadOf configuration, to modify the url
|
||||||
used to access a remote. Note that pushInsteadOf is not used;
|
used to access a remote. Note that pushInsteadOf is not used;
|
||||||
that and pushurl are reserved for actual git pushes. Closes: #644278
|
that and pushurl are reserved for actual git pushes. Closes: #644278
|
||||||
>>>>>>>
|
* status: List all known repositories.
|
||||||
|
* When displaying a list of repositories, show git remote names
|
||||||
|
in addition to their descriptions.
|
||||||
|
* Add locking to avoid races when changing the git-annex branch.
|
||||||
|
* Various speed improvements gained by using ByteStrings.
|
||||||
|
* Contain the zombie hordes.
|
||||||
|
|
||||||
-- Joey Hess <joeyh@debian.org> Thu, 29 Sep 2011 18:58:53 -0400
|
-- Joey Hess <joeyh@debian.org> Thu, 29 Sep 2011 18:58:53 -0400
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue