git - Restore history of divergent, then convergent repo -

-

i working on restoring history of codebase. have recovered commits lost @ root of git repo, , have discovered new complication.

a large chunk of code split separate codebase while... , merged in.

 main repo:  -- b -- c -- d -- e                   |         ^ code moved:       |         |                   v         | other repo:       x -- y -- z

when split (and merge) occurred, files copied target repo, , history lost.

to complicate matters further, files modified on each copy before commit, it's need commit changes.

this leads me 2 questions:

will possible replace commit d (which copies files in) lower branch (x-y-z)? (this priority.)

if that's possible, possible restore history of files created @ commit x well?

there around 300 commits on "other" repo, , around 5000 on "main" repo d onwards.

i suspect git-rebase required, ideally, make use of git-filter-branch not have manually resolve historical merge conflicts.

you may want set git replace-ments surgically alter / splice history, without changing contents of existing commits. filter-branch discussed elsewhere, cause these replacement grafts become permanent.

because git replace lets substitute in 1 replacement object wherever git "see" original, , because commits have parent commit ids, can replace single commit chain of several commits. instance, if commit x "bad" in well-defined way:

...--o--p--x--q--o--...

then construct new sequence of "good" commits g1 ... gn:

...--o--p--x--q--o--...          \           g1--g2--...--gn

(where g1's parent commit id p, our bad x commit's parent; if x needs, or deserves, multiple parents, can set of in commit g1). instruct git "replace" x gn, traversal looks this:

...--o--p--x- [replaced]  -q--o--...          \               /           g1--g2--...--gn

once filtered, x vanishes entirely, commits q , later being copied new copies in usual filter-branch fashion.

to construct "good" commits, can literally git checkout -b tempbranch <p> , start making commits, though if need set multiple parents bit more tricky (you can use git commit-tree instead of plain git commit, or cheat creating .git/merge_head remaining hashes in it). may want backdate new "good" commits, and/or set arbitrary authors (git commit has command line switches these, git commit-tree makes use magic env variables).


Comments

Post a Comment

Popular posts from this blog

c - zlib and gdi32 with OpenSSL? -

-
this follow question undefined reference rsa_generate_key in openssl? have openssl program generate rsa key, follows : #include <stdio.h> #include <openssl/rsa.h> #include <openssl/pem.h> int main(int argc, char* argv[]) { rsa *r = null; int ret; r = rsa_new(); bignum *bne = null; ret = rsa_generate_key_ex(r, 2048, bne, null); return 0; } when compile gcc -i../include rsatest.c -lcrypto -l. i undefined reference errors functions in libraries gdi32 , zlib. so correct this, have add -lz , -lgdi32, as gcc -i../include/ rsatest.c -lcrypto -lz -lgdi32 -l. my question is, aren't static libcrypto , libssl self sufficient? in why having add libraries make work? there option should have added while compiling library prevent this? i'm using 64 bit windows mingw compiler. made openssl library of msys , make.
Read more

java - inputmismatch exception -

-
Image
this question has answer here: scanner skipping nextline() after using next(), nextint() or other nextfoo()? 14 answers import java.util.*; public class ngg { static scanner numberentered; static scanner userinput = new scanner(system.in); static int guessednumber; static int randomnumber = (int) (math.random()* 11); static scanner reply; static string answer; public static void main(string[] args) { guesschecker(guessednumber); } public static void guesschecker(int userguess) { while (userguess != randomnumber) { intro(); userguess = intchecker(); if (userguess == randomnumber) { system.out.println("congradulations!"); system.exit(0); } else { system.out.println("that incorrect!");...
Read more

ios - Align baselines with characters in large line heights with Text Kit -

-
Image
when draw attributed string fixed line height text kit, characters aligned bottom of line fragment. while make sense on 1 line characters varying in size, breaks flow of text multiple lines. baselines appear decided largest descender each line. i've found article people behind sketch explaining exact problem in bit more detail , showing solution does, not explaining how achieved this. this want basically: when showing 2 lines large line height, result far ideal: the code i'm using: let smallfont = uifont.systemfont(ofsize: 15) let bigfont = uifont.systemfont(ofsize: 25) let paragraphstyle = nsmutableparagraphstyle() paragraphstyle.minimumlineheight = 22 paragraphstyle.maximumlineheight = 22 var attributes = [ nsfontattributename: smallfont, nsparagraphstyleattributename: paragraphstyle ] let textstorage = nstextstorage() let textcontainer = nstextcontainer(size: cgsize(width: 250, height: 500)) let layoutmanager = nslayoutmanager() textstorage.append(n...
Read more