git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 03/12] xmerge.c: minimum readability fixups

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Aug 30, 2008, 09:31 UTC
Message-ID
<alpine.DEB.1.00.0808301130250.24820@pacific.mpi-cbg.de.mpi-cbg.de>
In-Reply-To
<1220056963-2352-4-git-send-email-gitster@pobox.com>
Hi,
On Fri, 29 Aug 2008, Junio C Hamano wrote:
Show 10 quoted lines
> diff --git a/xdiff/xmerge.c b/xdiff/xmerge.c
> index 29cdbea..7dcd405 100644
> --- a/xdiff/xmerge.c
> +++ b/xdiff/xmerge.c
> @@ -427,7 +427,7 @@ static int xdl_do_merge(xdfenv_t *xe1, xdchange_t *xscr1, const char *name1,
>  			xscr2 = xscr2->next;
>  			continue;
>  		}
> -		if (level < 1 || xscr1->i1 != xscr2->i1 ||
> +		if (level == XDL_MERGE_MINIMAL || xscr1->i1 != xscr2->i1 ||
Yeah, okay, sorry.
Show 13 quoted lines
> @@ -449,12 +449,11 @@ static int xdl_do_merge(xdfenv_t *xe1, xdchange_t *xscr1, const char *name1,
>  			chg0 = xscr1->i1 + xscr1->chg1 - i0;
>  			chg1 = xscr1->i2 + xscr1->chg2 - i1;
>  			chg2 = xscr2->i2 + xscr2->chg2 - i2;
> -			if (ffo > 0)
> -				chg2 += ffo;
> -			else {
> +			if (ffo < 0) {
>  				chg0 -= ffo;
>  				chg1 -= ffo;
> -			}
> +			} else
> +				chg2 += ffo;

I do not understand why the order was changed, but hey, I do not care that deeply.

Ciao, Dscho

Previous: Johannes SchindelinNext: Junio C Hamano
Message 16 of 26 in “Towards a better merge resolution support”
  1. 00/12 Towards a better merge resolution supportJunio C Hamano, Aug 30, 2008
  2. 01/12 xdl_fill_merge_buffer(): separate out a too deeply nested functionJunio C Hamano, Aug 30, 2008
  3. 02/12 xdiff-merge: optionally show conflicts in "diff3 -m" styleJunio C Hamano, Aug 30, 2008
  4. 03/12 xmerge.c: minimum readability fixupsJunio C Hamano, Aug 30, 2008
  5. 04/12 xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or lessJunio C Hamano, Aug 30, 2008
  6. 05/12 rerere.c: use symbolic constants to keep track of parsing statesJunio C Hamano, Aug 30, 2008
  7. 06/12 rerere: understand "diff3 -m" style conflicts with the originalJunio C Hamano, Aug 30, 2008
  8. 07/12 merge.conflictstyle: choose between "merge" and "diff3 -m" stylesJunio C Hamano, Aug 30, 2008
  9. 08/12 git-merge-recursive: learn to honor merge.conflictstyleJunio C Hamano, Aug 30, 2008
  10. 09/12 checkout: do not check out unmerged higher stages randomlyJunio C Hamano, Aug 30, 2008
  11. 10/12 checkout: allow ignoring unmerged paths when checking out of the indexJunio C Hamano, Aug 30, 2008
  12. 11/12 checkout --ours/--theirsJunio C Hamano, Aug 30, 2008
  13. 12/12 checkout -m: recreate merge when checking out of unmerged indexJunio C Hamano, Aug 30, 2008
  14. Johannes SchindelinAug 30, 2008
  15. Johannes SchindelinAug 30, 2008
  16. Johannes SchindelinAug 30, 2008
  17. Junio C HamanoAug 30, 2008
  18. Johannes SchindelinAug 30, 2008
  19. Johannes SchindelinAug 30, 2008
  20. Alex RiesenSep 1, 2008
  21. Alex RiesenSep 1, 2008
  22. Abhijit Menon-SenSep 1, 2008
  23. Thomas RastSep 1, 2008
  24. Junio C HamanoSep 1, 2008
  25. Alex RiesenSep 1, 2008
  26. Junio C HamanoSep 1, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.