diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-05-29 20:12:17 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-05-29 20:17:05 -0400 |
| commit | 339a924da09f243b17df249529a23ab000e36022 (patch) | |
| tree | dd2d1d1b8ad64102ac63a01b49896f68aa23463e | |
| parent | fa93e60db454ab2c1b44c4ca48e093e166de9ad4 (diff) | |
webapp: When adding a new local repository, fix bug that caused its group and preferred content to be set in the current repository, even when not combining.
There was a tricky bit here, when it does combine, the edit form is shown,
and so the info needs to be committed to the new repository, but then
pulled into the current one. And caches need to be invalidated for it
to be visible in the edit form.
| -rw-r--r-- | Annex/Branch.hs | 2 | ||||
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | doc/bugs/Assistant_doesn__39__t_keep_separate_local_repositories_100__37___separate.mdwn | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/Annex/Branch.hs b/Annex/Branch.hs index 7a75d8acf..108f97b14 100644 --- a/Annex/Branch.hs +++ b/Annex/Branch.hs @@ -218,7 +218,7 @@ set = setJournalFile commit :: String -> Annex () commit = whenM journalDirty . forceCommit -{- Commits the current index to the branch even without any journalleda +{- Commits the current index to the branch even without any journalled - changes. -} forceCommit :: String -> Annex () forceCommit message = lockJournal $ \jl -> do diff --git a/debian/changelog b/debian/changelog index fa372d828..c1a7e3c03 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +git-annex (5.20140530) UNRELEASED; urgency=medium + + * webapp: When adding a new local repository, fix bug that caused its + group and preferred content to be set in the current repository, + even when not combining. + + -- Joey Hess <joeyh@debian.org> Thu, 29 May 2014 20:10:59 -0400 + git-annex (5.20140529) unstable; urgency=medium * Fix encoding of data written to git-annex branch. Avoid truncating diff --git a/doc/bugs/Assistant_doesn__39__t_keep_separate_local_repositories_100__37___separate.mdwn b/doc/bugs/Assistant_doesn__39__t_keep_separate_local_repositories_100__37___separate.mdwn index 54f8134d4..0ad0f1eb3 100644 --- a/doc/bugs/Assistant_doesn__39__t_keep_separate_local_repositories_100__37___separate.mdwn +++ b/doc/bugs/Assistant_doesn__39__t_keep_separate_local_repositories_100__37___separate.mdwn @@ -431,3 +431,5 @@ wanted f3b332fd-4b7a-4a5b-b077-8f13d3d9a407 = standard # (for trh@r9-y3pll:~/bar) #schedule 357eaef4-af1b-491a-a003-01c2d583056e = </code></pre> + +> [[fixed|done]] --[[Joey]] |