Error: "el parche no se aplica" al editar un colgado en el modo de parche

Quiero agregar de forma interactiva este colgado editándolo:

@@ -55,3 +50,28 @@ { - if(n_arguments == 1) + inputed_command = get_line(); //gets the user's input line from the stdin. + + //we edit the user's input as needed according to qtp rules. + /*STRING EDITING FUNCTIONS*/ + replace_string_chars(inputed_command, 9, ' '); + remove_char(inputed_command, 13); + remove_comments(inputed_command); + remove_extra_spaces(inputed_command); + uncapitalize(inputed_command); + /*END OF STRING EDITING FUNCTIONS*/ + + //the command gets seperated from the user's input ex. playmove w c3, here the command is playmove. + command = command_decode(inputed_command); + //the arguments are seperated from the user's input in an 2D array ex. playmove w c3, here the arguments are w and c3. + arguments = arguments_decode(inputed_command, &n_arguments); + + //the user specified command is executed by matching the user's command with the engine's available commands. if the user's command is not one of the engine's known commands then a descriptive error is printed. + if(strcmp(command, "name") == 0) + name(); + else if(strcmp(command, "known_command") == 0) + known_command(arguments, n_arguments); + else if(strcmp(command, "list_commands") == 0) + list_commands(); + else if(strcmp(command, "quit") == 0) + quit(&quit_game); + else if(strcmp(command, "boardsize") == 0) { 

Me gustaría organizar esta parte solamente:

 @@ -55,3 +50,28 @@ { - if(n_arguments == 1) + inputed_command = get_line(); //gets the user's input line from the stdin. + + //we edit the user's input as needed according to qtp rules. + /*STRING EDITING FUNCTIONS*/ + replace_string_chars(inputed_command, 9, ' '); + remove_char(inputed_command, 13); + remove_comments(inputed_command); + remove_extra_spaces(inputed_command); + uncapitalize(inputed_command); + /*END OF STRING EDITING FUNCTIONS*/ + + //the command gets seperated from the user's input ex. playmove w c3, here the command is playmove. + command = command_decode(inputed_command); + //the arguments are seperated from the user's input in an 2D array ex. playmove w c3, here the arguments are w and c3. + arguments = arguments_decode(inputed_command, &n_arguments); + { 

pero cuando guardo y salgo, se produce este error "el parche no se aplica".

He leído que necesito editar los numbers entre los @@ personajes, pero nunca lo hago bien. Sé descriptivo sobre cómo resolver este error, gracias.

Esto parece un simple caso de simplemente eliminar líneas '+' del parche. Lo único que veo que podría estar causando que tu parche falle es que la última llave tiene una sangría diferente en tus dos partes.

¿Está su editor aplicando las reglas de formatting automático mientras edita el parche?