mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions
git-annex/Annex
History
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
..
Branch Unneded constraint 2016-01-28 12:34:07 -04:00
Content remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
LockPool clarify 2016-03-01 16:22:47 -04:00
MetaData update my email address and homepage url 2015-01-21 12:50:09 -04:00
View remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Action.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
AdjustedBranch.hs 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
AutoMerge.hs assistant: Deal with upcoming git's refusal to merge unrelated histories by default 2016-04-22 14:26:44 -04:00
BloomFilter.hs Another redundant constraint 2016-01-28 12:34:07 -04:00
Branch.hs new method for merging changes into adjusted branch that avoids unncessary merge conflicts 2016-04-06 15:36:18 -04:00
BranchState.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
CatFile.hs add catCommit 2016-02-25 15:34:46 -04:00
CheckAttr.hs annex.largefiles can be configured in .gitattributes too 2016-02-02 15:18:17 -04:00
CheckIgnore.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Common.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Concurrent.hs Sped up git-annex add in direct mode and v6 by using git hash-object --batch. 2016-03-14 15:58:46 -04:00
Content.hs reinject: When src file's content cannot be verified, leave it alone, instead of deleting it. 2016-04-20 13:21:56 -04:00
Difference.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Direct.hs assistant: Deal with upcoming git's refusal to merge unrelated histories by default 2016-04-22 14:26:44 -04:00
DirHashes.hs a few hlints 2015-04-11 00:10:34 -04:00
Drop.hs add the known associated file to the list of others 2016-01-26 14:48:19 -04:00
Environment.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
FileMatcher.hs Include magic database in the linux and OSX standalone builds. 2016-02-26 11:54:15 -04:00
Fixup.hs avoid warnings about not exported System.Directory.isSymbolicLink 2016-04-28 15:18:11 -04:00
GitOverlay.hs adjusted branches need git 2.2.0 or newer 2016-04-22 12:29:32 -04:00
HashObject.hs Sped up git-annex add in direct mode and v6 by using git hash-object --batch. 2016-03-14 15:58:46 -04:00
Hook.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Ingest.hs Preserve execute bits of unlocked files in v6 mode. 2016-04-14 14:47:08 -04:00
Init.hs improve comment 2016-05-10 14:42:57 -04:00
InodeSentinal.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Journal.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Link.hs Preserve execute bits of unlocked files in v6 mode. 2016-04-14 14:47:08 -04:00
Locations.hs In the unusual configuration where annex.crippledfilesystem=true but core.symlinks=true, store object contents in mixed case hash directories so that symlinks will point to them. 2016-05-10 15:00:22 -04:00
LockFile.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
LockPool.hs pid locking configuration and abstraction layer for git-annex 2015-11-12 17:50:34 -04:00
MakeRepo.hs Use git-annex init --version=6 to get v6 for now 2015-12-15 17:17:13 -04:00
MetaData.hs metadata: Added -r to remove all current values of a field. 2016-02-29 13:00:46 -04:00
Notification.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
NumCopies.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Path.hs Fix bug introduced in the last release that broke git-annex sync when git-annex was installed from the standalone tarball. 2015-03-27 12:55:18 -04:00
Perms.hs fsck: Warn when core.sharedRepository is set and an annex object file's write bit is not set and cannot be set due to the file being owned by a different user. 2016-04-14 15:36:53 -04:00
Queue.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Quvi.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
ReplaceFile.hs Windows: Fix an over-long temp directory name. 2016-05-06 12:49:41 -04:00
SpecialRemote.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Ssh.hs Fix bug that prevented annex.sshcaching=false configuration from taking effect when on a crippled filesystem. Thanks, divergentdave. 2016-04-20 14:43:43 -04:00
TaggedPush.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Transfer.hs more windows build fix 2016-02-15 15:03:44 -04:00
Url.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
UUID.hs optimise getUUID 2016-01-20 16:55:06 -04:00
VariantFile.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Version.hs limit git annex adjust to v6 mode 2016-03-29 12:05:02 -04:00
View.hs new method for merging changes into adjusted branch that avoids unncessary merge conflicts 2016-04-06 15:36:18 -04:00
Wanted.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
WorkTree.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00