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

Merge branch 'master' of ssh://git-annex.branchable.com

Browse source
This commit is contained in:
Joey Hess 2017-05-31 17:08:22 -04:00
commit efb9ebbe7d
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
3 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
doc/bugs/Adding_metadata.mdwn Normal file
View file

@ -0,0 +1,18 @@
### Please describe the problem.
This is less of a bug and more of a feature(?) request. Currently, when assigning metadata to a datafile, git annex (v5.20150710-g8fd705) will produce no error or warning message if the file entered does not exist. This can be a tad confusing to users who might expect to see some output if they typed their path wrong. A successful `git annex metadata <filename> -s tags=best` will produce output acknowledging the change, but a failure produces no output at all. A quick check if the file exists, and a `File does not exist` error message if not, would be easy implement and helpful to new users.
### What steps will reproduce the problem?
git annex metadata <filename> -s tags+=atlas
Where <filename> does not exist.
### What version of git-annex are you using? On what operating system?
v5.20150710-g8fd705
### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
We use git-annex for our open-source !FreeSurfer software and find very helpful indeed. Thank you. https://surfer.nmr.mgh.harvard.edu/

6
doc/forum/controlling_how___34__git_annex_sync__34___resolves_conflicts.mdwn Normal file
View file

@ -0,0 +1,6 @@
Hi,
I'd like to know if there's an easy way to control how "git annex sync" resolves conflicts. I use git annex (with wrappers I have written) to manage repos full of debs. The debs themselves never conflict, but the metadata does. So far this works great if people check out the repo, add some debs in, regenerate the metadata from the debs (using external scripts), and then shove it back into the central repo. Many people can do this for our shared project.
This doesn't work well if two people have the repo checked out at the same time; when they "git annex sync" to shove the data back up, annex detects the merge conflict in the metadata and renames the files.
What I'd like is a flag saying that while pushing the changes upstream, the sync will only perform fast-forwards and fail if that doesn't work so my wrappers can abort the user's workflow. Any advice would be appreciated.

2
doc/git-annex-group.mdwn
View file

@ -4,7 +4,7 @@ git-annex group - add a repository to a group
# SYNOPSIS
git annex group `repository groupname`
git annex group `repository [groupname]`
# DESCRIPTION