mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions
git-annex/Assistant/Threads
History
Joey Hess 240bae38f6
sync: When in an adjusted branch, merge changes from the original branch 
This causes changes to the original branch to get merged with a single
sync. Before, it took 2 syncs; the first happened to update the synced/
branch, and the second merged changes from the synced/ branch into the
ajusted branch.

Using mergeToAdjustedBranch when tomerge == origbranch is probably
overkill, but it does work fine.

Sponsored-By: the NIH-funded NICEMAN (ReproNim TR&D3) project
2023-07-06 12:42:24 -04:00
..
Committer.hs assistant: Fix a crash when a small file is deleted immediately after being created 2023-06-19 12:44:56 -04:00
ConfigMonitor.hs add git ls-tree --long parser 2021-03-23 12:47:00 -04:00
Cronner.hs assistant: Avoid unncessary git repository repair 2021-06-30 18:00:16 -04:00
DaemonStatus.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Exporter.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Glacier.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Merger.hs sync: When in an adjusted branch, merge changes from the original branch 2023-07-06 12:42:24 -04:00
MountWatcher.hs filter out control characters in warning messages 2023-04-10 15:55:44 -04:00
NetWatcher.hs filter out control characters in warning messages 2023-04-10 15:55:44 -04:00
PairListener.hs filter out control characters in warning messages 2023-04-10 15:55:44 -04:00
ProblemFixer.hs assistant: Avoid unncessary git repository repair 2021-06-30 18:00:16 -04:00
Pusher.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
RemoteControl.hs convert to withCreateProcess for async exception safety 2020-06-04 12:44:09 -04:00
SanityChecker.hs filter out control characters in warning messages 2023-04-10 15:55:44 -04:00
TransferPoller.hs convert getFileSize to RawFilePath 2020-11-05 11:32:57 -04:00
Transferrer.hs propagate git-annex -c on to transferrer child process 2020-12-15 11:36:25 -04:00
TransferScanner.hs new matching options --want-get-by and --want-drop-by 2022-07-28 13:26:03 -04:00
TransferWatcher.hs filter out control characters in error messages 2023-04-10 13:50:51 -04:00
Upgrader.hs fix windows assistant upgrade glitch 2020-11-19 12:50:25 -04:00
UpgradeWatcher.hs finished this stage of the RawFilePath conversion 2020-11-04 14:20:37 -04:00
Watcher.hs filter out control characters in all other Messages 2023-04-11 12:58:01 -04:00
WebApp.hs switch from hslogger to purpose-built Utility.Debug 2021-04-05 13:40:31 -04:00