14d1e878ab
This is a new feature, it was not handled before, since it's a bit of an edge case. However, it can be handled exactly the same as a file/dir conflict, just leave the non-annexed item alone. While implementing this, the core resolveMerge' function got a lot simpler and clearer. Note especially that where before there was an asymetric call to stagefromdirectmergedir, now graftin is called symmetrically in both cases. And, in order to add that `graftin us`, the current branch needed to be known (if there is no current branch, there cannot be a merge conflict). This led to some cleanups of how autoMergeFrom behaved when there is no current branch. This commit was sponsored by Philippe Gauthier. |
||
|---|---|---|
| .. | ||
| Committer.hs | ||
| ConfigMonitor.hs | ||
| Cronner.hs | ||
| DaemonStatus.hs | ||
| Glacier.hs | ||
| Merger.hs | ||
| MountWatcher.hs | ||
| NetWatcher.hs | ||
| PairListener.hs | ||
| ProblemFixer.hs | ||
| Pusher.hs | ||
| SanityChecker.hs | ||
| TransferPoller.hs | ||
| Transferrer.hs | ||
| TransferScanner.hs | ||
| TransferWatcher.hs | ||
| Upgrader.hs | ||
| UpgradeWatcher.hs | ||
| Watcher.hs | ||
| WebApp.hs | ||
| XMPPClient.hs | ||
| XMPPPusher.hs | ||