Comment 29 for bug 113809

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Robert Collins wrote:
> John, I'm not sure where this was discussed previously, but all the bugs
> seem to be coalescing here.. Anyhow you proposed doing a single merge.
>
> I don't see how that can work: we have in the pathological case 3 heads:
> - current tree rev
> - current branch tip
> - current master tip

$ bzr update
tree rev => branch tip
note: tree is up to date with local branch, but still out-of-date with
remote branch, run bzr update again
$ bzr update
tree rev + branch tip => master tip

>
> Aaron suggested a long time ago that if the first merge conflicts, we
> should just stop there.
>

Sure. I think as for the specific branch that was reviewed, it blocked
if you had local commits and uncommitted changes, as that was easier to
detect and get working, and prevented some of the really bad
double-conflicted sections.

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAktYwnEACgkQJdeBCYSNAAP2KwCgqaO7dsytUtGZ5DuVmcT1ZZQI
5CEAmgLgfFJOcippP8eK8e2Nwppjvu4N
=A39P
-----END PGP SIGNATURE-----