git-annex/debian
Joey Hess 9f05be393e
adjust: If the adjusted branch already exists, avoid overwriting it, since it might contain changes that have not yet been propigated to the original branch.
Could not think of a foolproof way to detect if the old adjusted branch was
just behind the current branch. It's possible that the user amended the
adjusting commit at the head of the adjusted branch, for example.

I decided to bail in this situation, instead of just entering the old
branch, so that if git annex adjust succeeds the user is always in a
*current* adjusted branch, not some old and out of date one.

What could perhaps be done is enter the old branch and then update it. But
that seems too magical; the user may have rebased master or something or
may not want to propigate the changes from the old branch. Best to error
out.
2016-05-13 14:04:22 -04:00
..
patches Make git-annex-standalone.deb include the git-annex html documentation, desktop file, and base completion file, same as the regular git-annex.deb. 2015-11-10 13:21:05 -04:00
tests Debian: Run the builtin test suite as an autopkgtest. 2013-08-15 15:49:19 +02:00
cabal-wrapper support building with BUILDER=stack to use stack instead of cabal 2015-12-28 14:18:47 -04:00
changelog adjust: If the adjusted branch already exists, avoid overwriting it, since it might contain changes that have not yet been propigated to the original branch. 2016-05-13 14:04:22 -04:00
compat debhelper v9 2012-01-15 14:53:38 -04:00
control add missing dep on transformers 2016-04-27 14:16:45 -04:00
copyright Merge branch 'no-cbits' 2016-03-05 11:22:32 -04:00
create-standalone-changelog use BuildVersion in debian, which fixes windows build 2015-04-21 16:42:54 -04:00
doc-base Add doc-base file. Closes: 2011-04-06 21:57:22 -04:00
git-annex.lintian-overrides merge lintian overrides from debian 2015-08-15 11:45:37 -04:00
NEWS prep release 2013-10-02 16:13:45 -04:00
rules move -j1 setting to BUILDEROPTIONS, set in debian/rules file 2016-02-05 13:56:27 -04:00