On quarta-feira, 16 de mar?o de 2016 12:08:30 PDT Craig Pratt wrote: > a) The new eclipse repo was seeded with a *copy* of the TinyDTLS source tree > (not a git clone) - so the commit history and the branch revision that > IoTivity started with are not preserved;
As first, simply try to extract the patches (git format-patch, plus some sed / manual editing to get the paths right) and then apply with git am. If the patch is simple, even conflicts should be easy to fix. If you need more advanced conflict resolution, you'll need an unbroken history. There's a way around the cut. I don't know why they did it like that (Carsten, do you know?), but there's a mechanism in Git to get past this history restart. You basically need to download both repositories (add both as remotes, git fetch them), then create a file called .git/info/grafts that contains: <sha1 of the first Eclipse commit> <sha1 of the old commit that was imported> (there's one whitespace between the two SHA-1) After this is done, you'll be able to rebase our old commits on top of the new Eclipse tree. > I've cloned the TinyDTLS repo > and my plan is to create a branch for each feature we want to merge > upstream. From that we can tune the changes and generate patches that > should apply against the new repo. And once I can do that with at least one > change, I'll see about establishing a process with the maintainer/author > (Olaf). Great. Thanks for doing this, Craig. Shout out if you need help. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center
