[MERGE] help criss-cross should suggest using remerge

[John Arbash Meinel]

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

Aaron Bentley wrote:
| Martin Pool wrote:
|> It seems to me people who've got a criss-cross warning from merge will
|> commonly want to use remerge.  If that's correct we could suggest it...
|
| And I pretty much never use remerge.  I use revert; merge
|

I often use remerge because I need to fix 1 file out of 20 that got modified.

| Finally, remerge is broken with looms, because looms invert the parents
| in the merge.  So this could lead to problems for users of the loom plugin.
|

This is only for the up-thread/down-thread stuff, right? It isn't broken when
you just do a plain "merge".

|> +If you have conflicts from a criss-cross merge in your working directory,
|> +running "bzr remerge --weave FILE..." on particular affected files may
|> +help resolve the conflicts.
|
| We shouldn't suggest --weave, we should suggest --lca.  It is faster and
| gives better results.

Agreed.

|
|>  This command will discard any changes already
|> +made to the working file.
|
| That is false.  Remerge reuses the foo.THIS file, not the last-committed
| version of foo, so it preserves changes already made to the working file.
|
| Aaron

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

iD8DBQFH82krJdeBCYSNAAMRAmVDAJkBGaWO6rQtNwMDgRLU6W0S9G9hXACeOMZ0
k/mcfL9DPbUPtDUu63x33Xo=
=S0Zv
-----END PGP SIGNATURE-----