Closed avsm closed 13 years ago
Will take a look later today!
Sent from my iPhone
On 10 Sep 2011, at 11:33, Anil Madhavapeddy reply@reply.github.com wrote:
With this commit, I can add your repository as a
git remote
, do agit fetch
andgit merge
, and have the full history preserved inmirage.git
, along with a merge point to facilitate pulling in future changes from the same repository.This might actually be a good way to develop more of the protocol libraries out of tree without a full Mirage installation. But I suspect it'll get harder as the stdlib diverges.
You can merge this Pull Request by running:
git pull https://github.com/avsm/ocaml-fat master
Or you can view, comment on it, or merge it online at:
https://github.com/djs55/ocaml-fat/pull/1
-- Commit Summary --
- move files to a subdirectory more amenable to merging into mirage.git
-- File Changes --
R lib/fs/Makefile (0) R lib/fs/fat.ml (0)
-- Patch Links --
https://github.com/djs55/ocaml-fat/pull/1.patch https://github.com/djs55/ocaml-fat/pull/1.diff
Reply to this email directly or view it on GitHub: https://github.com/djs55/ocaml-fat/pull/1
Anil I think you can play with -prefix option to solve this kind of problems
The automerge feature doesn't like this one so I recreated it and pushed to master.
With this commit, I can add your repository as a
git remote
, do agit fetch
andgit merge
, and have the full history preserved inmirage.git
, along with a merge point to facilitate pulling in future changes from the same repository.This might actually be a good way to develop more of the protocol libraries out of tree without a full Mirage installation. But I suspect it'll get harder as the stdlib diverges.