[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Please merge the random translator into the Hurd repository
From: |
Justus Winter |
Subject: |
Re: Please merge the random translator into the Hurd repository |
Date: |
Mon, 09 Jun 2014 12:17:31 +0200 |
User-agent: |
alot/0.3.4 |
Hello Samuel :)
Quoting Justus Winter (2014-04-07 13:05:43)
> please merge the random translator (found in [0]) into the main Hurd
> repository.
I read up on various repository merging options. I believe that for
our needs, the following very simple approach works well:
1. In the repository to be merged, create a subdirectory and move all
files there. Fix the Makefile for an in-tree build. Mention that
the development will continue in the main Hurd repository.
2. Push that as the last commit to the repository.
3. Merge the whole repo into the Hurd one. Amend the Makefile.
I prepared this for your consideration here:
http://darnassus.sceen.net/gitweb/teythoon/hurd.git/shortlog/refs/heads/merge-random
Thanks,
Justus