From: Thomas Glanzmann <sithglan@stud.uni-erlangen.de>
Date: Mon, 06 Jun 2005 05:43:56 GMT
Subject: Re: Last mile for 1.0
Message-ID: <20050606054356.GB3669@cip.informatik.uni-erlangen.de>
In-Reply-To: <Pine.LNX.4.58.0506051658100.1876@ppc970.osdl.org>

Hello,

> >  - "What happens when a merge goes wrong" helper script Jeff
> >    wanted to have in *4*.

> Does anybody have any suggestions? Preferably with a reasonable 
> test-case, so that people can try it out.. Maybe just leaving the merge 
> failures where they are?

I think the simplest and effectivies way to handle this is the
following: Add a flag to the current merge script which indicates that
on conflicts the user will be dropped to a shell per conflict to solve:

	- Checkout filename.LOCAL, filename.REMOTE, filename.GCA (with
	  sanitychecks of course (eg not overwriting existing files)
	- Run merga -A on them and maybe wiggle and write the product in
	  filename
	- If the user resolves the conflict drop him a note to
	  'update-cache' the resolved conflict and exit the subshell.

I also have at the moment a very nice perl merge script which works with
multiple heads, duplicates and stuff. Maybe I should write this down in
bash.

The above approach worked out very good at least for me. I often had to
resolve 'simple' conflicts when pulling in upstream changes from Linus
repo.

	Thomas