Hi Justus! On Mon, 09 Jun 2014 12:17:31 +0200, Justus Winter <4win...@informatik.uni-hamburg.de> wrote: > 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.
For reference, on <https://sourceware.org/glibc/wiki/Release/2.16/PortsMerge>, you can review what has been done when merging glibc-ports into glibc proper -- at least I think these are the instructions we settled on using. (There has been related discussion on the libc-alpha mailing list the months before.) > 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 That looks reasonable. I would have done the subdirectory move, the merge itself, and the Hurd Makefile:prog-subdirs change as one big (merge) commit. Oh, and also (fold in?) a change to have the random translator use <version.h>? Then, push to the abandoned random translator branch a commit that removes all files but a small README file containing a note about the move -- or, in fact, just remove the branch? However, I'm likewise fine if you just push your merge-random branch as-is. That procedure can then also be used for other branches/repositories, if so desired. Grüße, Thomas
pgpBRopI3kKvJ.pgp
Description: PGP signature
