Bazaar

how to check merge for conflicts without actually merging?

Asked by Václav Šmilauer

I would like simulate the behivor of "svn --dry-run merge", which just shows conflicts but doesn't actually do the merge. It seems that some bzr commands do have --dry-run option, but not all of them (including merge). I am at 1.17.

Thank you.

Question information

Language:
English Edit question
Status:
Solved
For:
Bazaar Edit question
Assignee:
No assignee Edit question
Solved by:
Václav Šmilauer
Solved:
Last query:
Last reply:
Revision history for this message
John A Meinel (jameinel) said : 		#1

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

Václav Šmilauer wrote:
> New question #79202 on Bazaar:
> https://answers.launchpad.net/bzr/+question/79202
>
> I would like simulate the behivor of "svn --dry-run merge", which just shows conflicts but doesn't actually do the merge. It seems that some bzr commands do have --dry-run option, but not all of them (including merge). I am at 1.17.
>
> Thank you.
>

bzr merge --preview

John
=:->

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

iEYEARECAAYFAkp5dS8ACgkQJdeBCYSNAANsygCdGLayoARb2RHhCnSMxqnc5TD6
9pMAnAqLjOzkyM+tixbHiUrEbwdRuk39
=jj+v
-----END PGP SIGNATURE-----

Revision history for this message
Václav Šmilauer (eudoxos) said : 		#2

I've seen --preview, but that gives full diff, whereas --dry-run would show just if there is conflict. Anyway, --preview will probably do in our cases as well.

Thx

Revision history for this message
Martin Pool (mbp) said : 		#3

I think it would be nice to have a preview that just tells you about conflicts. I'd use this before submitting to PQM, for example.