duplicates - How to apply patches on the top of a git tree preventing duplication? -

-

I am seeking advice for a problem that I thought that simple, and it really is a small script But I think that should already be done in a way to do this with Git / Quilt / Stgit.

I'm not really doing good on Git and this is a problem for me.

My problem: I've got a guit tree (Linux kernel) and several patches. What happens, such a patch was intended for the older version of the kernel, and many of them have already been applied to my tree. A header row or patch 

  starting with b1af4315d823a2b6659c5b14bc17f7bc61878ef4 (timestamp)

and pre> Git b1af4315d823a2b6659c5b14bc17f7bc61878ef4 show

in my kernel tree, I can see this to my current tree is already available, and I've never tried to implement them.

I tried to use things like git apply or git am , but they try to apply the patch: 

  alan @ubuntu: ~ /Desktop/openwrt/linux-git/linux-2.6.33.y$ Git apply -P1 --check --index / home / Allen / desktop / OpenWRT / SVN / vomiting-branch / build_dir / Linux Kirkwood / Linux- 2.6.30.10/patches/generic/000-bzip_lzma_remove_nasty_hack.patch error: patch failed: lib / decompress_bunzip2.c: 45 error: lib / decompress_bunzip2.c: patch error does not apply : Patch failed: lib / decompress_unlzma.c: Error 29: Lib / decompress_unlzma.c: Patch does not apply  
 Thank you.   
 
 
 You can create a new branch of the version for which the patches were applied, by applying them and temporary branch merged with the master:  
  git checkout -b temp-branch v2.6.30 git I / apply ... patch ... git checkout master git merge temp-branch  
 
 This should resolve the most duplicated patches (though, it will not use encryption, rather patch contents). In addition, you can try  git rebase  in the previous step. 
 
 This is not the best way, but should do the trick.

Comments

Post a Comment

Popular posts from this blog

c# - sqlDecimal to decimal clr stored procedure Unable to cast object of type 'System.Data.SqlTypes.SqlDecimal' to type 'System.IConvertible' -

-
I'm new to this I'm writing a clr. stored procedure that can be used to get values ​​used in a calculation Call for another stored procedure for Gives an archived methodology int (I think SqlInt32? Value of the table's value is int) which is then necessary to convert to decimal. Here I have the code: Public static integral mood (SQL MDMMYLUE, escalistering AMY type, out of SQLDCM Result) {aResult = 0; Try {SqlConnection conn = New SqlConnection ("Reference Connection = True"); SqlCommand cmd = New SqlCommand ("sp_GetType", conn); Cmd.Parameters.AddWithValue ("@ myValueType", aMyValueType); Cmd.CommandType = CommandType.StoredProcedure; Conn.Open (); Object type = CMD. Exclamation Asser (); Conn.Close (); Decimal type FORCalculation = Convert. ToDecimal (type); Decimal value = convert toDecimal (aMyValue); // ** calculation calc = new calculation (); Decimal result = calorie.docalulation (typefarculation, value); I get an exception...
Read more

Calling GetGUIThreadInfo from Outlook VBA -

-
I need to find the active window'm writing a VBA macro in MS Outlook, which is a specific process. The goal of this is to get the active window / document name even if its original application has more than one document interface. User processor with GetCurrentThreadId is active, I am using GetGUIThreadInfo to get .dll. Here is the correct code: private type RECT as as Left LongPtr top LongPtr right LongPtr down LongPtr termination of private type GUITHREADINFO cbSize as LongPtr flags LongPtr hwndActive LongPtr hwndFocus LongPtr hwndCapture LongPtr as as as as as reset as LongPtr rcCaret as LongPtr hwndCreate as LongPtr hwndMoveSize as HwndMenuOwner end of Private Equity PtrSafe function GetWindowThreadProcessId Lib "user32" (_BVV hnw LongPtr as LongPtr Nig Mr. announced as PtrSafe function GetGUIThreadInfo Lib "user32" _ (ByVal dwthreadid as LongPtr, _ lpguithreadinfo as GUITHREADINFO) LongPtr Sub MyFunction () as dim strWindowTitle string = space as s...
Read more

Obfuscating Python code? -

-
I'm looking for a way to hide my Python source code. print "Hello World!" How can I encode this example so that it is not human-readable? I have been asked to use Base 64 but I'm not sure how. itemprop = "text"> It is limited only, first level ambiguous resolution, but has built-in: byte-code in Python Is a compiler for: dragon-o-m py_compile & lt; Your program.py & gt; creates a .pyo file with a byte-code, and where the docstrings are removed, etc. You can rename .pyo with the .py extension, and python & lt; Your program.py & gt; runs as your program, but it does not have your source code. PS : If your program blur modules like this, you need to rename them with the .pyc suffix (I Not sure it will not break a day), or you can work with .pyo and run them with python -o ... .pyo ( Import should work). This will allow dragon to search your modules (otherwise, Python looks for the .py module).
Read more